rpms/xorg-x11/devel xorg-x11-6.8.2-redhat-nv-disable-s2scopy-on-geforce-6x00.patch, 1.1, 1.2

[fedora-cvs-commits redhat com]

Author: mharris

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

Modified Files:
	xorg-x11-6.8.2-redhat-nv-disable-s2scopy-on-geforce-6x00.patch 
Log Message:
Updated xorg-x11-6.8.2-redhat-nv-disable-s2scopy-on-geforce-6x00.patch to add a log file message about ScreenToScreenCopy being disabled on some GeForce models

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

Index: xorg-x11-6.8.2-redhat-nv-disable-s2scopy-on-geforce-6x00.patch
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11/devel/xorg-x11-6.8.2-redhat-nv-disable-s2scopy-on-geforce-6x00.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xorg-x11-6.8.2-redhat-nv-disable-s2scopy-on-geforce-6x00.patch	8 Jul 2005 11:06:21 -0000	1.1
+++ xorg-x11-6.8.2-redhat-nv-disable-s2scopy-on-geforce-6x00.patch	12 Jul 2005 11:22:01 -0000	1.2
@@ -1,6 +1,6 @@
 --- 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 @@
+@@ -675,9 +675,31 @@
     accel->Flags = LINEAR_FRAMEBUFFER | PIXMAP_CACHE | OFFSCREEN_PIXMAPS;
     accel->Sync = NVSync;
  
@@ -19,6 +19,11 @@
 +       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;