rpms/xorg-x11-drv-ati/devel radeon-r6xx-fix.patch, NONE, 1.1 xorg-x11-drv-ati.spec, 1.164, 1.165

[Dave Airlie]

Author: airlied

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

Modified Files:
	xorg-x11-drv-ati.spec 
Added Files:
	radeon-r6xx-fix.patch 
Log Message:
* Fri Apr 03 2009 Dave Airlie <airlied at redhat.com> 6.12.1-3
- fix up r600 xv src offsets hopefully


radeon-r6xx-fix.patch:

--- NEW FILE radeon-r6xx-fix.patch ---
>From c3d0bb80ce0c2e70b05168e4ab8fa2b4de539d7b Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied at redhat.com>
Date: Fri, 3 Apr 2009 20:34:05 +1100
Subject: [PATCH] r600: fix src offsets after kms changes

---
 src/r600_textured_videofuncs.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/r600_textured_videofuncs.c b/src/r600_textured_videofuncs.c
index 3dfe151..f4b4f1e 100644
--- a/src/r600_textured_videofuncs.c
+++ b/src/r600_textured_videofuncs.c
@@ -215,7 +215,7 @@ R600DisplayTexturedVideo(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv)
     switch(pPriv->id) {
     case FOURCC_YV12:
     case FOURCC_I420:
-	accel_state->src_mc_addr[0] = pPriv->src_offset;
+	accel_state->src_mc_addr[0] = pPriv->src_offset + info->fbLocation + pSrcn->fbOffset;
 	accel_state->src_size[0] = accel_state->src_pitch[0] * pPriv->h;
 
 	/* flush texture cache */
@@ -316,7 +316,7 @@ R600DisplayTexturedVideo(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv)
     case FOURCC_UYVY:
     case FOURCC_YUY2:
     default:
-	accel_state->src_mc_addr[0] = pPriv->src_offset;
+	accel_state->src_mc_addr[0] = pPriv->src_offset + info->fbLocation + pSrcn->fbOffset;
 	accel_state->src_size[0] = accel_state->src_pitch[0] * pPriv->h;
 
 	/* flush texture cache */
-- 
1.6.2



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.164
retrieving revision 1.165
diff -u -r1.164 -r1.165
--- xorg-x11-drv-ati.spec	1 Apr 2009 12:03:34 -0000	1.164
+++ xorg-x11-drv-ati.spec	3 Apr 2009 09:38:20 -0000	1.165
@@ -5,7 +5,7 @@
 Summary:   Xorg X11 ati video driver
 Name:      xorg-x11-drv-ati
 Version:   6.12.1
-Release:   2%{?dist}
+Release:   3%{?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-r6xx-fix.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 .r6xv
 
 %build
 autoreconf -iv
@@ -76,6 +78,9 @@
 %{_mandir}/man4/radeon.4*
 
 %changelog
+* Fri Apr 03 2009 Dave Airlie <airlied at redhat.com> 6.12.1-3
+- fix up r600 xv src offsets hopefully
+
 * Wed Apr 01 2009 Dave Airlie <airlied at redhat.com> 6.12.1-2
 - attempt to fix r100/r200 xv better