rpms/xorg-x11-drv-ati/F-11 radeon-6.12.2-fix-rs690-clamp.patch, NONE, 1.1 xorg-x11-drv-ati.spec, 1.179, 1.180

[Dave Airlie]

Author: airlied

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

Modified Files:
	xorg-x11-drv-ati.spec 
Added Files:
	radeon-6.12.2-fix-rs690-clamp.patch 
Log Message:
* Thu Apr 23 2009 Dave Airlie <airlied at redhat.com> 6.12.2-5
- rs690: fix crashing when firefox or gimp is used


radeon-6.12.2-fix-rs690-clamp.patch:

--- NEW FILE radeon-6.12.2-fix-rs690-clamp.patch ---
>From 0323106d6bd6dd7b7354f4a22b8e6135459e017a Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied at redhat.com>
Date: Thu, 23 Apr 2009 15:52:41 +1000
Subject: [PATCH] radeon: tx clamping

---
 src/radeon_exa_render.c          |   11 ++++++++---
 src/radeon_textured_videofuncs.c |    3 +++
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/radeon_exa_render.c b/src/radeon_exa_render.c
index ca46505..7f3c93a 100644
--- a/src/radeon_exa_render.c
+++ b/src/radeon_exa_render.c
@@ -1278,23 +1278,28 @@ static Bool FUNC_NAME(R300TextureSetup)(PicturePtr pPict, PixmapPtr pPix,
 	    else
 		txfilter |= R300_TX_CLAMP_T(R300_TX_CLAMP_CLAMP_GL);
 
+	    txfilter |= R300_TX_CLAMP_R(R300_TX_CLAMP_CLAMP_GL);
 	    break;
 	case RepeatPad:
 	    txfilter |= R300_TX_CLAMP_S(R300_TX_CLAMP_CLAMP_LAST) |
-		        R300_TX_CLAMP_T(R300_TX_CLAMP_CLAMP_LAST);
+		        R300_TX_CLAMP_T(R300_TX_CLAMP_CLAMP_LAST) |
+		        R300_TX_CLAMP_R(R300_TX_CLAMP_CLAMP_LAST);
 	    break;
 	case RepeatReflect:
 	    txfilter |= R300_TX_CLAMP_S(R300_TX_CLAMP_MIRROR) |
+		        R300_TX_CLAMP_T(R300_TX_CLAMP_MIRROR) |
 		        R300_TX_CLAMP_T(R300_TX_CLAMP_MIRROR);
 	    break;
 	case RepeatNone:
 	    txfilter |= R300_TX_CLAMP_S(R300_TX_CLAMP_CLAMP_GL) |
-		        R300_TX_CLAMP_T(R300_TX_CLAMP_CLAMP_GL);
+		        R300_TX_CLAMP_T(R300_TX_CLAMP_CLAMP_GL) |
+		        R300_TX_CLAMP_R(R300_TX_CLAMP_CLAMP_GL);
 	    break;
 	}
     } else
 	txfilter |= R300_TX_CLAMP_S(R300_TX_CLAMP_CLAMP_GL) |
-	            R300_TX_CLAMP_T(R300_TX_CLAMP_CLAMP_GL);
+	            R300_TX_CLAMP_T(R300_TX_CLAMP_CLAMP_GL) |
+	            R300_TX_CLAMP_R(R300_TX_CLAMP_CLAMP_GL);
 
     switch (pPict->filter) {
     case PictFilterNearest:
diff --git a/src/radeon_textured_videofuncs.c b/src/radeon_textured_videofuncs.c
index 852f4ac..581b477 100644
--- a/src/radeon_textured_videofuncs.c
+++ b/src/radeon_textured_videofuncs.c
@@ -263,6 +263,7 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
 
 	txfilter = (R300_TX_CLAMP_S(R300_TX_CLAMP_CLAMP_LAST) |
 		    R300_TX_CLAMP_T(R300_TX_CLAMP_CLAMP_LAST) |
+		    R300_TX_CLAMP_R(R300_TX_CLAMP_CLAMP_LAST) |
 		    R300_TX_MAG_FILTER_LINEAR |
 		    R300_TX_MIN_FILTER_LINEAR |
 		    (0 << R300_TX_ID_SHIFT));
@@ -299,6 +300,7 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
 	    txpitch -= 1;
 	    txfilter = (R300_TX_CLAMP_S(R300_TX_CLAMP_CLAMP_LAST) |
 		        R300_TX_CLAMP_T(R300_TX_CLAMP_CLAMP_LAST) |
+		        R300_TX_CLAMP_R(R300_TX_CLAMP_CLAMP_LAST) |
 			R300_TX_MIN_FILTER_LINEAR |
 			R300_TX_MAG_FILTER_LINEAR);
 
@@ -334,6 +336,7 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
 		/* Tex filter */
 		txfilter = (R300_TX_CLAMP_S(R300_TX_CLAMP_WRAP) |
 			    R300_TX_CLAMP_T(R300_TX_CLAMP_WRAP) |
+			    R300_TX_CLAMP_R(R300_TX_CLAMP_WRAP) |
 			    R300_TX_MIN_FILTER_NEAREST |
 			    R300_TX_MAG_FILTER_NEAREST |
 			    (1 << R300_TX_ID_SHIFT));
-- 
1.6.2.2



Index: xorg-x11-drv-ati.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/F-11/xorg-x11-drv-ati.spec,v
retrieving revision 1.179
retrieving revision 1.180
diff -u -r1.179 -r1.180
--- xorg-x11-drv-ati.spec	16 Apr 2009 21:02:55 -0000	1.179
+++ xorg-x11-drv-ati.spec	23 Apr 2009 05:57:23 -0000	1.180
@@ -5,7 +5,7 @@
 Summary:   Xorg X11 ati video driver
 Name:      xorg-x11-drv-ati
 Version:   6.12.2
-Release:   4%{?dist}
+Release:   5%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -18,6 +18,7 @@
 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
 
 ExcludeArch: s390 s390x
 
@@ -44,6 +45,7 @@
 %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
 
 %build
 autoreconf -iv
@@ -75,6 +77,9 @@
 %{_mandir}/man4/radeon.4*
 
 %changelog
+* Thu Apr 23 2009 Dave Airlie <airlied at redhat.com> 6.12.2-5
+- rs690: fix crashing when firefox or gimp is used
+
 * Thu Apr 16 2009 Dave Airlie <airlied at redhat.com> 6.12.2-4
 - radeon-modeset.patch: fix stupid idle drawing corrupt since mmap cache