rpms/xorg-x11/FC-4 xorg-x11-6.8.2-redhat-nv-disable-s2scopy-on-geforce-6x00.patch, NONE, 1.1

[fedora-cvs-commits at redhat.com]

Author: mharris

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

Added Files:
	xorg-x11-6.8.2-redhat-nv-disable-s2scopy-on-geforce-6x00.patch 
Log Message:
Add xorg-x11-6.8.2-redhat-nv-disable-s2scopy-on-geforce-6x00.patch from merge

xorg-x11-6.8.2-redhat-nv-disable-s2scopy-on-geforce-6x00.patch:
 nv_xaa.c |   28 +++++++++++++++++++++++++---
 1 files changed, 25 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,31 @@
    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 ) {
+      xf86Msg(X_INFO, "Note: XAA accelerated Screen2ScreenCopy is disabled currently\n"
+              "on GeForce 6200/6600/6800 hardware as it is known to hang on this\n"
+              "hardware.  Once a fix is made available from the upstream driver\n"
+              "maintainer for this issue, an updated driver might be made available\n"
+              "in a future update.\n");
+      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;