rpms/xorg-x11-drv-nv/devel nv-2.1.12-fb-size.patch, 1.1, 1.2 xorg-x11-drv-nv.spec, 1.74, 1.75

[Adam Jackson]

Author: ajax

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

Modified Files:
	nv-2.1.12-fb-size.patch xorg-x11-drv-nv.spec 
Log Message:
* Wed Sep 10 2008 Adam Jackson <ajax at redhat.com> 2.1.12-3
- Do the fb size hack a differently wretched way.


nv-2.1.12-fb-size.patch:

Index: nv-2.1.12-fb-size.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nv/devel/nv-2.1.12-fb-size.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nv-2.1.12-fb-size.patch	8 Sep 2008 19:30:07 -0000	1.1
+++ nv-2.1.12-fb-size.patch	10 Sep 2008 18:21:33 -0000	1.2
@@ -1,15 +1,14 @@
 diff -up xf86-video-nv-2.1.12/src/g80_driver.c.jx xf86-video-nv-2.1.12/src/g80_driver.c
---- xf86-video-nv-2.1.12/src/g80_driver.c.jx	2008-09-08 15:26:55.000000000 -0400
-+++ xf86-video-nv-2.1.12/src/g80_driver.c	2008-09-08 15:28:40.000000000 -0400
-@@ -446,7 +446,10 @@ G80PreInit(ScrnInfoPtr pScrn, int flags)
-     }
+--- xf86-video-nv-2.1.12/src/g80_driver.c.jx	2008-09-10 14:16:04.000000000 -0400
++++ xf86-video-nv-2.1.12/src/g80_driver.c	2008-09-10 14:18:04.000000000 -0400
+@@ -447,6 +447,10 @@ G80PreInit(ScrnInfoPtr pScrn, int flags)
  
      xf86CrtcConfigInit(pScrn, &randr12_screen_funcs);
--    xf86CrtcSetSizeRange(pScrn, 320, 200, 8192, 8192);
-+    if (pScrn->videoRam >= 32768)
-+	xf86CrtcSetSizeRange(pScrn, 3840, 1200, 8192, 8192);
-+    else
-+	xf86CrtcSetSizeRange(pScrn, 320, 200, 8192, 8192);
+     xf86CrtcSetSizeRange(pScrn, 320, 200, 8192, 8192);
++    if (!pScrn->display->virtualX && pScrn->videoRam > 65536) {
++	pScrn->display->virtualX = 3840;
++	pScrn->display->virtualY = 1200;
++    }
  
      if(!xf86LoadSubModule(pScrn, "i2c")) goto fail;
      if(!xf86LoadSubModule(pScrn, "ddc")) goto fail;


Index: xorg-x11-drv-nv.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nv/devel/xorg-x11-drv-nv.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- xorg-x11-drv-nv.spec	8 Sep 2008 19:30:07 -0000	1.74
+++ xorg-x11-drv-nv.spec	10 Sep 2008 18:21:33 -0000	1.75
@@ -5,7 +5,7 @@
 Summary:   Xorg X11 nv video driver
 Name:      xorg-x11-drv-nv
 Version:   2.1.12
-Release:   2%{?dist}
+Release:   3%{?dist}
 URL:       http://www.x.org
 License: MIT
 Group:     User Interface/X Hardware Support
@@ -71,6 +71,9 @@
 %{_mandir}/man4/nv.4*
 
 %changelog
+* Wed Sep 10 2008 Adam Jackson <ajax at redhat.com> 2.1.12-3
+- Do the fb size hack a differently wretched way.
+
 * Mon Sep 08 2008 Adam Jackson <ajax at redhat.com> 2.1.12-2
 - nv-2.1.12-fb-size.patch: Yet more lame heuristics to preallocate a usable
   framebuffer for laptops. (#458864)