xf86-video-ati: Branch 'master'

[Dave Airlie]

 src/r6xx_accel.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 0061c4db1d3aecdca13efb5133ab8784dc37df95
Author: Dave Airlie <airlied at redhat.com>
Date:   Wed Nov 25 15:39:10 2009 +1000

    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.

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);
 }