rpms/xorg-x11-drv-nv/devel nv-2.1.8-g80-no-doublescan.patch, NONE, 1.1 xorg-x11-drv-nv.spec, 1.77, 1.78

[Adam Jackson]

Author: ajax

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

Modified Files:
	xorg-x11-drv-nv.spec 
Added Files:
	nv-2.1.8-g80-no-doublescan.patch 
Log Message:
* Wed Oct 22 2008 Adam Jackson <ajax at redhat.com> 2.1.12-6
- nv-2.1.8-g80-no-doublescan.patch: Disable doublescan on G80, too many
  monitors get confused.


nv-2.1.8-g80-no-doublescan.patch:

--- NEW FILE nv-2.1.8-g80-no-doublescan.patch ---
diff -up xf86-video-nv-2.1.8/src/g80_dac.c.jx xf86-video-nv-2.1.8/src/g80_dac.c
--- xf86-video-nv-2.1.8/src/g80_dac.c.jx	2008-01-29 20:55:21.000000000 -0500
+++ xf86-video-nv-2.1.8/src/g80_dac.c	2008-04-29 16:44:08.000000000 -0400
@@ -205,7 +205,7 @@ G80CreateDac(ScrnInfoPtr pScrn, ORNum or
     pPriv->set_pclk = G80DacSetPClk;
     output->driver_private = pPriv;
     output->interlaceAllowed = TRUE;
-    output->doubleScanAllowed = TRUE;
+    output->doubleScanAllowed = FALSE;
 
     return output;
 }
diff -up xf86-video-nv-2.1.8/src/g80_sor.c.jx xf86-video-nv-2.1.8/src/g80_sor.c
--- xf86-video-nv-2.1.8/src/g80_sor.c.jx	2008-03-06 15:33:15.000000000 -0500
+++ xf86-video-nv-2.1.8/src/g80_sor.c	2008-04-29 16:44:16.000000000 -0400
@@ -510,7 +510,7 @@ G80CreateSor(ScrnInfoPtr pScrn, ORNum or
         pPriv->set_pclk = G80SorSetPClk;
     output->driver_private = pPriv;
     output->interlaceAllowed = TRUE;
-    output->doubleScanAllowed = TRUE;
+    output->doubleScanAllowed = FALSE;
 
     return output;
 }


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.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- xorg-x11-drv-nv.spec	30 Sep 2008 13:33:13 -0000	1.77
+++ xorg-x11-drv-nv.spec	22 Oct 2008 17:29:30 -0000	1.78
@@ -5,7 +5,7 @@
 Summary:   Xorg X11 nv video driver
 Name:      xorg-x11-drv-nv
 Version:   2.1.12
-Release:   5%{?dist}
+Release:   6%{?dist}
 URL:       http://www.x.org
 License: MIT
 Group:     User Interface/X Hardware Support
@@ -30,6 +30,11 @@
 Patch5:	    nv-2.1.6-starvation.patch
 Patch6:	    nv-2.1.6-panel-fix.patch
 Patch7:	    nv-save-rom.patch
+<<<<<<< xorg-x11-drv-nv.spec
+Patch8:	    nv-2.1.12-fb-size.patch
+Patch9:	    nv-2.1.8-g80-no-doublescan.patch
+=======
+>>>>>>> 1.77
 
 %description 
 X.Org X11 nv video driver.
@@ -42,6 +47,11 @@
 %patch5 -p1 -b .starve
 %patch6 -p1 -b .panel
 %patch7 -p1 -b .save-rom
+<<<<<<< xorg-x11-drv-nv.spec
+%patch8 -p1 -b .fb-size
+%patch9 -p1 -b .doublescan
+=======
+>>>>>>> 1.77
 
 %build
 %configure --disable-static
@@ -68,6 +78,10 @@
 %{_mandir}/man4/nv.4*
 
 %changelog
+* Wed Oct 22 2008 Adam Jackson <ajax at redhat.com> 2.1.12-6
+- nv-2.1.8-g80-no-doublescan.patch: Disable doublescan on G80, too many
+  monitors get confused.
+
 * Tue Sep 30 2008 Dan Williams <dcbw at redhat.com> 2.1.12-5
 - Port Toshiba Tecra M2 NV34 panel tweak to pciaccess