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

[Dave Airlie]

Author: airlied

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

Modified Files:
	radeon-6.12.2-fix-rs690-clamp.patch xorg-x11-drv-ati.spec 
Log Message:
* Fri Apr 24 2009 Dave Airlie <airlied at redhat.com> 6.12.2-6
- rs690: fix clamps patch so it doesn't break other cards


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

Index: radeon-6.12.2-fix-rs690-clamp.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/F-11/radeon-6.12.2-fix-rs690-clamp.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- radeon-6.12.2-fix-rs690-clamp.patch	23 Apr 2009 05:57:23 -0000	1.1
+++ radeon-6.12.2-fix-rs690-clamp.patch	24 Apr 2009 05:59:20 -0000	1.2
@@ -1,13 +1,3 @@
-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
@@ -45,14 +35,14 @@
      switch (pPict->filter) {
      case PictFilterNearest:
 diff --git a/src/radeon_textured_videofuncs.c b/src/radeon_textured_videofuncs.c
-index 852f4ac..581b477 100644
+index 852f4ac..0fbb364 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_CLAMP_R(R300_TX_CLAMP_CLAMP_BORDER) |
  		    R300_TX_MAG_FILTER_LINEAR |
  		    R300_TX_MIN_FILTER_LINEAR |
  		    (0 << R300_TX_ID_SHIFT));
@@ -60,7 +50,7 @@
  	    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_CLAMP_R(R300_TX_CLAMP_CLAMP_BORDER) |
  			R300_TX_MIN_FILTER_LINEAR |
  			R300_TX_MAG_FILTER_LINEAR);
  
@@ -68,10 +58,7 @@
  		/* 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_CLAMP_R(R300_TX_CLAMP_CLAMP_BORDER) |
  			    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.180
retrieving revision 1.181
diff -u -r1.180 -r1.181
--- xorg-x11-drv-ati.spec	23 Apr 2009 05:57:23 -0000	1.180
+++ xorg-x11-drv-ati.spec	24 Apr 2009 05:59:20 -0000	1.181
@@ -5,7 +5,7 @@
 Summary:   Xorg X11 ati video driver
 Name:      xorg-x11-drv-ati
 Version:   6.12.2
-Release:   5%{?dist}
+Release:   6%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -77,6 +77,9 @@
 %{_mandir}/man4/radeon.4*
 
 %changelog
+* Fri Apr 24 2009 Dave Airlie <airlied at redhat.com> 6.12.2-6
+- rs690: fix clamps patch so it doesn't break other cards
+
 * Thu Apr 23 2009 Dave Airlie <airlied at redhat.com> 6.12.2-5
 - rs690: fix crashing when firefox or gimp is used