xf86-video-ati: Branch 'master'

[Dave Airlie]

 src/r6xx_accel.c |   27 ++-------------------------
 src/radeon_kms.c |    6 ++++++
 2 files changed, 8 insertions(+), 25 deletions(-)

New commits:
commit ba76acc76e0d0a51a1c488e4d5494a71e155a05b
Author: Dave Airlie <airlied at redhat.com>
Date:   Tue Nov 24 15:38:47 2009 +1000

    radeon/kms: drop special r600 indirect flush
    
    This just merges it with the main kms cs flush

diff --git a/src/r6xx_accel.c b/src/r6xx_accel.c
index dd74d46..a89bfb3 100644
--- a/src/r6xx_accel.c
+++ b/src/r6xx_accel.c
@@ -39,29 +39,6 @@
 
 #include "radeon_drm.h"
 
-#if defined(XF86DRM_MODE)
-void r600_cs_flush_indirect(ScrnInfoPtr pScrn)
-{
-    RADEONInfoPtr info = RADEONPTR(pScrn);
-    int ret;
-
-    if (!info->cs->cdw)
-	return;
-
-    if (info->accel_state->vb_ptr) {
-	radeon_bo_unmap(info->accel_state->vb_bo);
-	info->accel_state->vb_ptr = NULL;
-    }
-
-    radeon_cs_emit(info->cs);
-    radeon_cs_erase(info->cs);
-
-    ret = radeon_cs_space_check(info->cs);
-    if (ret)
-	ErrorF("space check failed in flush\n");
-}
-#endif
-
 /* Flush the indirect buffer to the kernel for submission to the card */
 void R600CPFlushIndirect(ScrnInfoPtr pScrn, drmBufPtr ib)
 {
@@ -72,7 +49,7 @@ void R600CPFlushIndirect(ScrnInfoPtr pScrn, drmBufPtr ib)
 
 #if defined(XF86DRM_MODE)
     if (info->cs) {
-	r600_cs_flush_indirect(pScrn);
+	radeon_cs_flush_indirect(pScrn);
 	return;
     }
 #endif
@@ -111,7 +88,7 @@ void R600IBDiscard(ScrnInfoPtr pScrn, drmBufPtr ib)
 	    info->accel_state->vb_ptr = NULL;
         }
 	if (CS_FULL(info->cs)) {
-	    r600_cs_flush_indirect(pScrn);
+	    radeon_cs_flush_indirect(pScrn);
 	    return;
 	}
 	radeon_cs_erase(info->cs);
diff --git a/src/radeon_kms.c b/src/radeon_kms.c
index f149e0c..cafc329 100644
--- a/src/radeon_kms.c
+++ b/src/radeon_kms.c
@@ -78,6 +78,12 @@ void radeon_cs_flush_indirect(ScrnInfoPtr pScrn)
 
     if (!info->cs->cdw)
 	return;
+
+    if (info->accel_state->vb_ptr) {
+	radeon_bo_unmap(info->accel_state->vb_bo);
+	info->accel_state->vb_ptr = NULL;
+    }
+
     radeon_cs_emit(info->cs);
     radeon_cs_erase(info->cs);