diff --git a/radeon-6.12.2-fix-xv-warning.patch b/radeon-6.12.2-fix-xv-warning.patch
new file mode 100644
index 0000000..07fefef
--- /dev/null
+++ b/radeon-6.12.2-fix-xv-warning.patch
@@ -0,0 +1,12 @@
+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);
diff --git a/xorg-x11-drv-ati.spec b/xorg-x11-drv-ati.spec
index d9f662d..5c888b3 100644
--- a/xorg-x11-drv-ati.spec
+++ b/xorg-x11-drv-ati.spec
@@ -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 @@ Patch1:     radeon-modeset.patch
 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 @@ X.Org X11 ati video driver.
 %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 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man4/radeon.4*
 
 %changelog
+* Mon Apr 27 2009 Dave Airlie <airlied@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@redhat.com> 6.12.2-6
 - rs690: fix clamps patch so it doesn't break other cards