- r600 fix for TFP from irc

mesa.spec

@@ -21,7 +21,7 @@
 Summary: Mesa graphics libraries
 Name: mesa
 Version: 7.6
-Release: 0.10%{?dist}
+Release: 0.11%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.mesa3d.org
@@ -43,6 +43,7 @@ Patch3: mesa-no-mach64.patch
 
 Patch7: mesa-7.1-link-shared.patch
 Patch9: intel-revert-vbl.patch
+Patch10: r600-fix-tfp.patch
 
 Patch13: mesa-7.5-sparc64.patch
 
@@ -178,6 +179,7 @@ This package provides some demo applications for testing Mesa.
 %patch3 -p1 -b .no-mach64
 %patch7 -p1 -b .dricore
 %patch9 -p1 -b .intel-vbl
+%patch10 -p1 -b .r600_tfp
 %patch13 -p1 -b .sparc64
 %patch20 -p1 -b .dri2-page-flip
 %patch30 -p1 -b .vblank-warning
@@ -387,6 +389,9 @@ rm -rf $RPM_BUILD_ROOT
 %{demodir}
 
 %changelog
+* Wed Sep 09 2009 Dave Airlie <airlied@redhat.com> 7.6-0.11
+- r600 fix for TFP from irc
+
 * Wed Sep 09 2009 Dave Airlie <airlied@redhat.com> 7.6-0.10
 - new git snap for 090909
 

r600-fix-tfp.patch

@@ -0,0 +1,31 @@
+From 5aaa45de4c367dd6ec5daa6f4a54504b0aff1aca Mon Sep 17 00:00:00 2001
+From: Dave Airlie <airlied@linux.ie>
+Date: Wed, 9 Sep 2009 15:02:16 +1000
+Subject: [PATCH] r600: don't setup hardware state if TFP
+
+if we have a BO here it means TFP and we should have set it
+up already.
+
+tested by b0le on #radeon
+---
+ src/mesa/drivers/dri/r600/r600_texstate.c |    4 ++++
+ 1 files changed, 4 insertions(+), 0 deletions(-)
+
+diff --git a/src/mesa/drivers/dri/r600/r600_texstate.c b/src/mesa/drivers/dri/r600/r600_texstate.c
+index fff6e74..ff4ef1e 100644
+--- a/src/mesa/drivers/dri/r600/r600_texstate.c
++++ b/src/mesa/drivers/dri/r600/r600_texstate.c
+@@ -608,6 +608,10 @@ static void setup_hardware_state(context_t *rmesa, struct gl_texture_object *tex
+ 	int firstlevel = t->mt ? t->mt->firstLevel : 0;
+ 	GLuint uTexelPitch, row_align;
+ 
++	if ( t->bo ) {
++		return GL_TRUE;
++	}
++
+ 	firstImage = t->base.Image[0][firstlevel];
+ 
+ 	if (!t->image_override) {
+-- 
+1.6.2.5
+