rpms/xorg-x11-drv-i810/devel intel-2.4.2-fb-size.patch, 1.1, 1.2 xorg-x11-drv-i810.spec, 1.107, 1.108

[Adam Jackson]

Author: ajax

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

Modified Files:
	intel-2.4.2-fb-size.patch xorg-x11-drv-i810.spec 
Log Message:
* Wed Sep 10 2008 Adam Jackson <ajax at redhat.com> 2.4.2-7
- Do the fb size hack a different terrible way.


intel-2.4.2-fb-size.patch:

Index: intel-2.4.2-fb-size.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-i810/devel/intel-2.4.2-fb-size.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- intel-2.4.2-fb-size.patch	8 Sep 2008 19:41:02 -0000	1.1
+++ intel-2.4.2-fb-size.patch	10 Sep 2008 18:13:46 -0000	1.2
@@ -1,33 +1,16 @@
 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 {
+--- xf86-video-intel-2.4.2/src/i830_driver.c.jx	2008-09-10 14:07:08.000000000 -0400
++++ xf86-video-intel-2.4.2/src/i830_driver.c	2008-09-10 14:12:38.000000000 -0400
+@@ -1482,6 +1482,12 @@ I830PreInitCrtcConfig(ScrnInfoPtr pScrn)
  	max_width = 2048;
  	max_height = 2048;
      }
--    xf86CrtcSetSizeRange (pScrn, 320, 200, max_width, max_height);
-+    xf86CrtcSetSizeRange (pScrn, min_width, min_height, max_width, max_height);
++
++    if (!pScrn->display->virtualX && IS_I965G(pI830) && pI830->FbMapSize > 0x4000000) {
++	pScrn->display->virtualX = 3840;
++	pScrn->display->virtualY = 1200;
++    }
++
+     xf86CrtcSetSizeRange (pScrn, 320, 200, 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.107
retrieving revision 1.108
diff -u -r1.107 -r1.108
--- xorg-x11-drv-i810.spec	9 Sep 2008 08:15:49 -0000	1.107
+++ xorg-x11-drv-i810.spec	10 Sep 2008 18:13:46 -0000	1.108
@@ -6,7 +6,7 @@
 Summary:   Xorg X11 Intel video driver(s)
 Name:      xorg-x11-drv-i810
 Version:   2.4.2
-Release:   6%{?dist}
+Release:   7%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -106,6 +106,9 @@
 %{_libdir}/libIntelXvMC.so
 
 %changelog
+* Wed Sep 10 2008 Adam Jackson <ajax at redhat.com> 2.4.2-7
+- Do the fb size hack a different terrible way.
+
 * Tue Sep 09 2008 Dave Airlie <airlied at redhat.com> 2.4.2-6
 - fix typo in drmmode display.c