rpms/xorg-x11-drv-ati/F-12 r600-no-multi-op.patch, NONE, 1.1 xorg-x11-drv-ati.spec, 1.196, 1.197

[Dave Airlie]

Author: airlied

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

Modified Files:
	xorg-x11-drv-ati.spec 
Added Files:
	r600-no-multi-op.patch 
Log Message:
* Thu Nov 26 2009 Dave Airlie <airlied at redhat.com> 6.13.0-0.14.20091125git8b28534bc
- revert r600 multi-op for now seems to cause regression


r600-no-multi-op.patch:
 r6xx_accel.c |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

--- NEW FILE r600-no-multi-op.patch ---
>From 0061c4db1d3aecdca13efb5133ab8784dc37df95 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied at redhat.com>
Date: Wed, 25 Nov 2009 15:39:10 +1000
Subject: [PATCH] Revert "r600: enable multiple operations in one CS"

turn this off for now, on my rv635 desktop, I started getting blanks
in places in firefox and the odd bit of font corruption, need to
track that down.

This reverts commit 985a065518b1d33599de33f7fe082d3302db58a6.
---
 src/r6xx_accel.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/src/r6xx_accel.c b/src/r6xx_accel.c
index ea3ef07..0ca44ad 100644
--- a/src/r6xx_accel.c
+++ b/src/r6xx_accel.c
@@ -1240,6 +1240,5 @@ void r600_finish_op(ScrnInfoPtr pScrn)
     accel_state->vb_start_op = 0;
     accel_state->ib_reset_op = 0;
 
-    if (!info->cs)
-        R600CPFlushIndirect(pScrn, accel_state->ib);
+    R600CPFlushIndirect(pScrn, accel_state->ib);
 }
-- 
1.6.5.2



Index: xorg-x11-drv-ati.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/F-12/xorg-x11-drv-ati.spec,v
retrieving revision 1.196
retrieving revision 1.197
diff -u -p -r1.196 -r1.197
--- xorg-x11-drv-ati.spec	25 Nov 2009 04:09:45 -0000	1.196
+++ xorg-x11-drv-ati.spec	26 Nov 2009 09:38:07 -0000	1.197
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 ati video driver
 Name:      xorg-x11-drv-ati
 Version:   6.13.0
-Release:   0.13.%{gitdate}git%{gitversion}%{?dist}
+Release:   0.14.%{gitdate}git%{gitversion}%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -21,6 +21,7 @@ Source1:    mkxinf
 Patch6:     radeon-6.9.0-bgnr-enable.patch
 Patch10:    radeon-6.12.2-lvds-default-modes.patch
 Patch13:    fix-default-modes.patch
+Patch14:    r600-no-multi-op.patch
 
 ExcludeArch: s390 s390x
 
@@ -47,6 +48,7 @@ X.Org X11 ati video driver.
 %patch6 -p1 -b .bgnr
 %patch10 -p1 -b .lvds
 %patch13 -p1 -b .def
+%patch14 -p1 -b .r600-noop
 
 %build
 autoreconf -iv
@@ -80,6 +82,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man4/radeon.4*
 
 %changelog
+* Thu Nov 26 2009 Dave Airlie <airlied at redhat.com> 6.13.0-0.14.20091125git8b28534bc
+- revert r600 multi-op for now seems to cause regression
+
 * Wed Nov 25 2009 Dave Airlie <airlied at redhat.com> 6.13.0-0.13.20091125git8b28534bc
 - rebase to upstream with r600 speed ups and r100 fixes integrated.