rpms/xorg-x11/devel xorg-x11-6.8.2-redhat-nv-disable-s2scopy-on-geforce-6x00.patch, NONE, 1.1 xorg-x11.spec, 1.211, 1.212

[fedora-cvs-commits at redhat.com]

Author: mharris

Update of /cvs/dist/rpms/xorg-x11/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18713

Modified Files:
	xorg-x11.spec 
Added Files:
	xorg-x11-6.8.2-redhat-nv-disable-s2scopy-on-geforce-6x00.patch 
Log Message:
Added xorg-x11-6.8.2-redhat-nv-disable-s2scopy-on-geforce-6x00.patch to attempt workaround to #157715

xorg-x11-6.8.2-redhat-nv-disable-s2scopy-on-geforce-6x00.patch:
 nv_xaa.c |   23 ++++++++++++++++++++---
 1 files changed, 20 insertions(+), 3 deletions(-)

--- NEW FILE xorg-x11-6.8.2-redhat-nv-disable-s2scopy-on-geforce-6x00.patch ---
--- xc/programs/Xserver/hw/xfree86/drivers/nv/nv_xaa.c.nv-disable-s2scopy-on-geforce-6x00	2005-07-08 04:01:19.000000000 -0400
+++ xc/programs/Xserver/hw/xfree86/drivers/nv/nv_xaa.c	2005-07-08 05:54:01.000000000 -0400
@@ -675,9 +675,26 @@
    accel->Flags = LINEAR_FRAMEBUFFER | PIXMAP_CACHE | OFFSCREEN_PIXMAPS;
    accel->Sync = NVSync;
 
-   accel->ScreenToScreenCopyFlags = NO_TRANSPARENCY;
-   accel->SetupForScreenToScreenCopy = NVSetupForScreenToScreenCopy;
-   accel->SubsequentScreenToScreenCopy = NVSubsequentScreenToScreenCopy;
+   /* XXX - Fedora Core 4 users report that GeForce 6[268]00 hardware
+    * crashes on startup, but when XaaNoScreenToScreenCopy is enabled
+    * the problem is no longer present, so we're disabling it on the
+    * specific chips that we receive bug reports about, which include
+    * an X server log or output of "lspci -vvn".
+    *
+    * https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=157715
+    */
+   if (pNv->pEnt->device->chipID == 0x0140 ||
+       pNv->pEnt->device->chipID == 0x014f ||
+       pNv->pEnt->device->chipID == 0x0041 ||
+       pNv->pEnt->device->chipID == 0x00f1 ) {
+      accel->ScreenToScreenCopyFlags = NULL;
+      accel->SetupForScreenToScreenCopy = NULL;
+      accel->SubsequentScreenToScreenCopy = NULL;
+   } else {
+      accel->ScreenToScreenCopyFlags = NO_TRANSPARENCY;
+      accel->SetupForScreenToScreenCopy = NVSetupForScreenToScreenCopy;
+      accel->SubsequentScreenToScreenCopy = NVSubsequentScreenToScreenCopy;
+   }
 
    accel->SolidFillFlags = 0;
    accel->SetupForSolidFill = NVSetupForSolidFill;


Index: xorg-x11.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11/devel/xorg-x11.spec,v
retrieving revision 1.211
retrieving revision 1.212
diff -u -r1.211 -r1.212
--- xorg-x11.spec	5 Jul 2005 15:30:58 -0000	1.211
+++ xorg-x11.spec	8 Jul 2005 11:06:21 -0000	1.212
@@ -18,7 +18,7 @@
 
 Name: xorg-x11
 Version: 6.8.2
-Release: 41
+Release: 42
 #Release: 1.FC3.41
 #Release: ?.FC4.41
 
@@ -392,6 +392,9 @@
 # Patches 1650-1674: neomagic driver patches
 # Patches 1675-1699: nv driver patches
 Patch1675: xorg-x11-6.8.2-nv-driver-CVSHEAD-6.8.99.13.patch
+# TEMPORARY workaround for bug in nv driver (#157715), until there is a
+# real upstream fix.
+Patch1676: xorg-x11-6.8.2-redhat-nv-disable-s2scopy-on-geforce-6x00.patch
 # Patches 1700-1719: rendition driver patches
 # Patches 1720-1739: s3 driver patches
 # Patches 1740-1759: s3virge driver patches
@@ -1083,6 +1086,7 @@
 #%patch1301 -p0 -b .chips-default-to-swcursor-on-65550
 
 %patch1675 -p0 -b .nv-driver-CVSHEAD-6.8.99.13
+%patch1676 -p0 -b .redhat-nv-disable-s2scopy-on-geforce-6x00
 
 ######################################################################
 %patch2022 -p1 -b .agpgart-load
@@ -3589,6 +3593,14 @@
 [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT 
 
 %changelog
+* Fri Jul  8 2005 Mike A. Harris <mharris at redhat.com> 6.8.2-42
+- Added xorg-x11-6.8.2-redhat-nv-disable-s2scopy-on-geforce-6x00.patch to
+  work around "nv" driver bug, by disabling ScreenToScreenCopy on certain
+  GeForce 6200/6800/6800 cards which the problem has been reported on,
+  until there is a real upstream fix, as the current CVS head driver we
+  now have, still suffers from the problem.  We may also need to blacklist
+  other cards as new reports come in.  (#157715)
+
 * Mon Jul  4 2005 Mike A. Harris <mharris at redhat.com> 6.8.2-41
 - Added xorg-x11-6.8.2-nv-driver-CVSHEAD-6.8.99.13.patch backport of CVS head
   nv driver to track the latest bug fixes and hardware support.  Hopefully