rpms/xorg-x11-drv-ati/devel radeon-fix-r600-xv.patch, NONE, 1.1 xorg-x11-drv-ati.spec, 1.155, 1.156

[Dave Airlie]

Author: airlied

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

Modified Files:
	xorg-x11-drv-ati.spec 
Added Files:
	radeon-fix-r600-xv.patch 
Log Message:
* Tue Mar 10 2009 Dave Airlie <airlied at redhat.com> 6.11.0-7
- fix r600 xv, thanks to twoerner on #radeon for testing


radeon-fix-r600-xv.patch:

--- NEW FILE radeon-fix-r600-xv.patch ---
diff -up xf86-video-ati-6.11.0/src/radeon_textured_video.c.dave xf86-video-ati-6.11.0/src/radeon_textured_video.c
--- xf86-video-ati-6.11.0/src/radeon_textured_video.c.dave	2009-03-10 21:36:00.000000000 +1000
+++ xf86-video-ati-6.11.0/src/radeon_textured_video.c	2009-03-10 21:36:11.000000000 +1000
@@ -572,7 +572,7 @@ RADEONPutImageTextured(ScrnInfoPtr pScrn
 #ifdef XF86DRI
     if (IS_R600_3D)
 	R600DisplayTexturedVideo(pScrn, pPriv);
-    if (info->directRenderingEnabled || info->drm_mode_setting)
+    else if (info->directRenderingEnabled || info->drm_mode_setting)
 	RADEONDisplayTexturedVideoCP(pScrn, pPriv);
     else
 #endif


Index: xorg-x11-drv-ati.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/devel/xorg-x11-drv-ati.spec,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -r1.155 -r1.156
--- xorg-x11-drv-ati.spec	10 Mar 2009 02:04:50 -0000	1.155
+++ xorg-x11-drv-ati.spec	10 Mar 2009 12:33:12 -0000	1.156
@@ -5,7 +5,7 @@
 Summary:   Xorg X11 ati video driver
 Name:      xorg-x11-drv-ati
 Version:   6.11.0
-Release:   6%{?dist}
+Release:   7%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -19,6 +19,7 @@
 #Patch4:     radeon-6.9.0-remove-limit-heuristics.patch
 Patch5:	    radeon-6.9.0-panel-size-sanity.patch
 Patch6:     radeon-6.9.0-bgnr-enable.patch
+Patch7:	    radeon-fix-r600-xv.patch
 
 ExcludeArch: s390 s390x
 
@@ -45,6 +46,7 @@
 #patch4 -p1 -b .remove-limit-heuristics
 #%patch5 -p1 -b .panel-size
 %patch6 -p1 -b .bgnr
+%patch7 -p1 -b .r600xv
 
 %build
 autoreconf -iv
@@ -76,6 +78,9 @@
 %{_mandir}/man4/radeon.4*
 
 %changelog
+* Tue Mar 10 2009 Dave Airlie <airlied at redhat.com> 6.11.0-7
+- fix r600 xv, thanks to twoerner on #radeon for testing
+
 * Tue Mar 10 2009 Dave Airlie <airlied at redhat.com> 6.11.0-6
 - master fixes for panning + enable r600 accel by default