rpms/xorg-x11-drv-ati/F-11 radeon-6.12.2-fix-xv-warning.patch, NONE, 1.1 xorg-x11-drv-ati.spec, 1.181, 1.182

[Dave Airlie]

Author: airlied

Update of /cvs/pkgs/rpms/xorg-x11-drv-ati/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16877

Modified Files:
	xorg-x11-drv-ati.spec 
Added Files:
	radeon-6.12.2-fix-xv-warning.patch 
Log Message:
* Mon Apr 27 2009 Dave Airlie <airlied at redhat.com> 6.12.2-7
- revert rs690 fixes for now until we can research properly
- fix xv warning


radeon-6.12.2-fix-xv-warning.patch:

--- NEW FILE radeon-6.12.2-fix-xv-warning.patch ---
diff -up xf86-video-ati-6.12.2/src/radeon_textured_videofuncs.c.dma xf86-video-ati-6.12.2/src/radeon_textured_videofuncs.c
--- xf86-video-ati-6.12.2/src/radeon_textured_videofuncs.c.dma	2009-04-27 11:23:13.000000000 +1000
+++ xf86-video-ati-6.12.2/src/radeon_textured_videofuncs.c	2009-04-27 11:23:22.000000000 +1000
@@ -1601,7 +1601,7 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(Sc
 	    }
 	}
 
-	qwords = info->new_cs ? 8 : 6;
+	qwords = info->new_cs ? 7 : 6;
 	BEGIN_ACCEL(qwords);
 	OUT_ACCEL_REG(R300_TX_INVALTAGS, 0);
 	OUT_ACCEL_REG(R300_TX_ENABLE, txenable);


Index: xorg-x11-drv-ati.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/F-11/xorg-x11-drv-ati.spec,v
retrieving revision 1.181
retrieving revision 1.182
diff -u -r1.181 -r1.182
--- xorg-x11-drv-ati.spec	24 Apr 2009 05:59:20 -0000	1.181
+++ xorg-x11-drv-ati.spec	27 Apr 2009 01:25:03 -0000	1.182
@@ -5,7 +5,7 @@
 Summary:   Xorg X11 ati video driver
 Name:      xorg-x11-drv-ati
 Version:   6.12.2
-Release:   6%{?dist}
+Release:   7%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -18,7 +18,8 @@
 Patch6:     radeon-6.9.0-bgnr-enable.patch
 Patch7:	    radeon-6.12.1-r600-fb-size.patch
 Patch8:	    radeon-6.12.2-kms-gamma.patch
-Patch9:     radeon-6.12.2-fix-rs690-clamp.patch
+#Patch9:     radeon-6.12.2-fix-rs690-clamp.patch
+Patch10:    radeon-6.12.2-fix-xv-warning.patch
 
 ExcludeArch: s390 s390x
 
@@ -45,7 +46,8 @@
 %patch7 -p1 -b .r600-fb-size
 # don't do this yet, kernel will oops if you do
 #patch8 -p1 -b .kms-gamma
-%patch9 -p1 -b .rs690clamp
+#patch9 -p1 -b .rs690clamp
+%patch10 -p1 -b .fix-xvwarn
 
 %build
 autoreconf -iv
@@ -77,6 +79,10 @@
 %{_mandir}/man4/radeon.4*
 
 %changelog
+* Mon Apr 27 2009 Dave Airlie <airlied at redhat.com> 6.12.2-7
+- revert rs690 fixes for now until we can research properly
+- fix xv warning
+
 * Fri Apr 24 2009 Dave Airlie <airlied at redhat.com> 6.12.2-6
 - rs690: fix clamps patch so it doesn't break other cards