rpms/xorg-x11-drv-ati/F-11 radeon-6.12.2-rs690-hack.patch, NONE, 1.1 xorg-x11-drv-ati.spec, 1.187, 1.188

[Dave Airlie]

Author: airlied

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

Modified Files:
	xorg-x11-drv-ati.spec 
Added Files:
	radeon-6.12.2-rs690-hack.patch 
Log Message:
* Wed May 06 2009 Dave Airlie <airlied at redhat.com> 6.12.2-12
- radeon-6.12.2-rs690-hack.patch - workaround rs690 hangs with firefox safely


radeon-6.12.2-rs690-hack.patch:

--- NEW FILE radeon-6.12.2-rs690-hack.patch ---
diff --git a/src/radeon_exa_render.c b/src/radeon_exa_render.c
index b49c2fb..f9fe707 100644
--- a/src/radeon_exa_render.c
+++ b/src/radeon_exa_render.c
@@ -1265,6 +1265,11 @@ static Bool FUNC_NAME(R300TextureSetup)(PicturePtr pPict, PixmapPtr pPix,
 
     txfilter = (unit << R300_TX_ID_SHIFT);
 
+    /* workaround strange firefox chip hang on rs690 */
+    if (info->ChipFamily == CHIP_FAMILY_RS600 ||
+        info->ChipFamily == CHIP_FAMILY_RS690)
+        txfilter |= R300_TX_CLAMP_R(R300_TX_CLAMP_CLAMP_BORDER);
+
     if (pPict->repeat) {
 	switch (pPict->repeatType) {
 	case RepeatNormal:


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.187
retrieving revision 1.188
diff -u -p -r1.187 -r1.188
--- xorg-x11-drv-ati.spec	5 May 2009 05:53:55 -0000	1.187
+++ xorg-x11-drv-ati.spec	6 May 2009 04:58:37 -0000	1.188
@@ -5,7 +5,7 @@
 Summary:   Xorg X11 ati video driver
 Name:      xorg-x11-drv-ati
 Version:   6.12.2
-Release:   11%{?dist}
+Release:   12%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -19,6 +19,7 @@ Patch2:     radeon-modeset-fixes.patch
 Patch6:     radeon-6.9.0-bgnr-enable.patch
 Patch7:	    radeon-6.12.1-r600-fb-size.patch
 Patch8:     radeon-src-readback-cpu.patch
+Patch9:     radeon-6.12.2-rs690-hack.patch
 
 ExcludeArch: s390 s390x
 
@@ -45,6 +46,7 @@ X.Org X11 ati video driver.
 %patch6 -p1 -b .bgnr
 %patch7 -p1 -b .r600-fb-size
 %patch8 -p1 -b .srcrb
+%patch9 -p1 -b .rs690
 
 %build
 autoreconf -iv
@@ -76,6 +78,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man4/radeon.4*
 
 %changelog
+* Wed May 06 2009 Dave Airlie <airlied at redhat.com> 6.12.2-12
+- radeon-6.12.2-rs690-hack.patch - workaround rs690 hangs with firefox safely
+
 * Tue May 05 2009 Dave Airlie <airlied at redhat.com> 6.12.2-11
 - make src/mask prepare access force to GTT.