rpms/xorg-x11-drv-ati/devel radeon-exa-fixes.patch, NONE, 1.1 xorg-x11-drv-ati.spec, 1.116, 1.117

[Dave Airlie]

Author: airlied

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

Modified Files:
	xorg-x11-drv-ati.spec 
Added Files:
	radeon-exa-fixes.patch 
Log Message:
- exa offset fixes for changes in X server


radeon-exa-fixes.patch:

--- NEW FILE radeon-exa-fixes.patch ---
commit 05f489fc270f3af78189b6f5d1f0ed46a99dbf1b
Author: Dave Airlie <airlied at redhat.com>
Date:   Fri Sep 26 11:38:36 2008 +1000

    radeon: fix the offset checks for command submission
    
    since we are relocating in the kernel we don't need these

diff --git a/src/radeon_exa_render.c b/src/radeon_exa_render.c
index 456cefe..8f98e92 100644
--- a/src/radeon_exa_render.c
+++ b/src/radeon_exa_render.c
@@ -1016,8 +1016,10 @@ static Bool FUNC_NAME(R300TextureSetup)(PicturePtr pPict, PixmapPtr pPix,
     txpitch = exaGetPixmapPitch(pPix);
     txoffset = exaGetPixmapOffset(pPix);
 
-    if ((txoffset & 0x1f) != 0)
-	RADEON_FALLBACK(("Bad texture offset 0x%x\n", (int)txoffset));
+    if (!info->new_cs) {
+    	if ((txoffset & 0x1f) != 0)
+		RADEON_FALLBACK(("Bad texture offset 0x%x\n", (int)txoffset));
+    }
     if ((txpitch & 0x1f) != 0)
 	RADEON_FALLBACK(("Bad texture pitch 0x%x\n", (int)txpitch));
 
@@ -1234,7 +1236,7 @@ static Bool FUNC_NAME(R300PrepareComposite)(int op, PicturePtr pSrcPicture,
 
     colorpitch |= dst_format;
 
-    if ((dst_offset & 0x0f) != 0)
+    if (!info->new_cs && ((dst_offset & 0x0f) != 0))
 	RADEON_FALLBACK(("Bad destination offset 0x%x\n", (int)dst_offset));
     if (((dst_pitch >> pixel_shift) & 0x7) != 0)
 	RADEON_FALLBACK(("Bad destination pitch 0x%x\n", (int)dst_pitch));


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.116
retrieving revision 1.117
diff -u -r1.116 -r1.117
--- xorg-x11-drv-ati.spec	26 Sep 2008 00:53:39 -0000	1.116
+++ xorg-x11-drv-ati.spec	26 Sep 2008 01:41:42 -0000	1.117
@@ -5,7 +5,7 @@
 Summary:   Xorg X11 ati video driver
 Name:      xorg-x11-drv-ati
 Version:   6.9.0
-Release:   16%{?dist}
+Release:   17%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -16,6 +16,7 @@
 
 Patch0:	    radeon-6.9.0-to-git.patch
 Patch1:     radeon-modeset.patch
+Patch3:     radeon-exa-fixes.patch
 Patch4:     radeon-6.9.0-remove-limit-heuristics.patch
 Patch5:	    radeon-6.9.0-panel-size-sanity.patch
 Patch6:     copy-fb-contents.patch
@@ -39,6 +40,7 @@
 %setup -q -n %{tarball}-%{version}
 %patch0 -p1 -b .git
 %patch1 -p1 -b .modeset
+%patch3 -p1 -b .exa-fixes
 %patch4 -p1 -b .remove-limit-heuristics
 %patch5 -p1 -b .panel-size
 %patch6 -p1 -b .copy-fb-contents
@@ -73,6 +75,9 @@
 %{_mandir}/man4/radeon.4*
 
 %changelog
+* Fri Sep 26 2008 Dave Airlie <airlied at redhat.com> 6.9.0-17
+- exa offset fixes for changes in X server
+
 * Fri Sep 26 2008 Dave Airlie <airlied at redhat.com> 6.9.0-16
 - rebase to a later tree - still not fully up to git master
 - add some fixes to the resize stuff - not fully done