xf86-video-ati: Branch 'master'

[Alex Deucher]

 src/r6xx_accel.c |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 801e83227a59a29eea425ea612083bbf2b536c30
Author: Wolfram <bugzilla1 at malloc.de>
Date:   Mon Jun 21 18:59:19 2010 -0400

    r6xx/r7xx: fix ums cmd buffer leak
    
    Fixes:
    https://bugs.freedesktop.org/show_bug.cgi?id=27957

diff --git a/src/r6xx_accel.c b/src/r6xx_accel.c
index c8ef451..0edfe8b 100644
--- a/src/r6xx_accel.c
+++ b/src/r6xx_accel.c
@@ -1283,6 +1283,8 @@ void r600_vb_no_space(ScrnInfoPtr pScrn, int vert_size)
     }
 #endif 
 
-    r600_finish_op(pScrn, vert_size);
-    r600_cp_start(pScrn);
+    if (accel_state->vb_start_op != -1) {
+	r600_finish_op(pScrn, vert_size);
+	r600_cp_start(pScrn);
+    }
 }