rpms/xorg-x11-drv-i810/devel intel-2.4.2-fb-size.patch, NONE, 1.1 xorg-x11-drv-i810.spec, 1.105, 1.106

[Adam Jackson]

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-drv-i810/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10617

Modified Files:
	xorg-x11-drv-i810.spec 
Added Files:
	intel-2.4.2-fb-size.patch 
Log Message:
* Mon Sep 08 2008 Adam Jackson <ajax at redhat.com> 2.4.2-5
- intel-2.4.2-fb-size.patch: Yet more lame heuristics to preallocate a
  usable framebuffer for laptops. (#458864)


intel-2.4.2-fb-size.patch:

--- NEW FILE intel-2.4.2-fb-size.patch ---
diff -up xf86-video-intel-2.4.2/src/i830_driver.c.jx xf86-video-intel-2.4.2/src/i830_driver.c
--- xf86-video-intel-2.4.2/src/i830_driver.c.jx	2008-09-08 15:36:41.000000000 -0400
+++ xf86-video-intel-2.4.2/src/i830_driver.c	2008-09-08 15:40:53.000000000 -0400
@@ -1461,6 +1461,7 @@ I830PreInitCrtcConfig(ScrnInfoPtr pScrn)
 {
     xf86CrtcConfigPtr   xf86_config;
     I830Ptr pI830 = I830PTR(pScrn);
+    int min_width, min_height;
     int max_width, max_height;
 
     if (pI830->use_drm_mode)
@@ -1475,14 +1476,20 @@ I830PreInitCrtcConfig(ScrnInfoPtr pScrn)
 
     /* See i830_exa.c comments for why we limit the framebuffer size like this.
      */
+    min_width = 320;
+    min_height = 200;
     if (IS_I965G(pI830)) {
+	if (pScrn->videoRam >= 65536) {
+	    min_width = 3840;
+	    min_height = 1200;
+	}
 	max_width = 8192;
 	max_height = 8192;
     } else {
 	max_width = 2048;
 	max_height = 2048;
     }
-    xf86CrtcSetSizeRange (pScrn, 320, 200, max_width, max_height);
+    xf86CrtcSetSizeRange (pScrn, min_width, min_height, max_width, max_height);
 }
 
 static Bool


Index: xorg-x11-drv-i810.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-i810/devel/xorg-x11-drv-i810.spec,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -r1.105 -r1.106
--- xorg-x11-drv-i810.spec	8 Sep 2008 05:45:37 -0000	1.105
+++ xorg-x11-drv-i810.spec	8 Sep 2008 19:41:02 -0000	1.106
@@ -6,7 +6,7 @@
 Summary:   Xorg X11 Intel video driver(s)
 Name:      xorg-x11-drv-i810
 Version:   2.4.2
-Release:   4%{?dist}
+Release:   5%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -26,6 +26,7 @@
 Patch5: intel-fix-irq.patch
 # fd.o bug 17341
 Patch6: i830-render-init-no-map.patch
+Patch7: intel-2.4.2-fb-size.patch
 
 ExclusiveArch: %{ix86} x86_64 ia64
 
@@ -60,6 +61,7 @@
 #patch4 -p1 -b .fixflip
 %patch5 -p1 -b .irqfix
 %patch6 -p1 -b .exafix
+%patch7 -p1 -b .fb-size
 
 %build
 
@@ -102,6 +104,10 @@
 %{_libdir}/libIntelXvMC.so
 
 %changelog
+* Mon Sep 08 2008 Adam Jackson <ajax at redhat.com> 2.4.2-5
+- intel-2.4.2-fb-size.patch: Yet more lame heuristics to preallocate a
+  usable framebuffer for laptops. (#458864)
+
 * Mon Sep 08 2008 Dave Airlie <airlied at redhat.com> 2.4.2-4
 - Add patch from fd.o bug 17341 to fix problems on intel EXA