xf86-video-ati: Branch 'master'

[Dave Airlie]

 src/radeon_kms.c |   11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

New commits:
commit 98824f37fc74dc1fec2677515d0dc3cfc263f00a
Author: Dave Airlie <airlied at redhat.com>
Date:   Mon Jul 6 15:29:53 2009 +1000

    radeon: move state changes into flush function

diff --git a/src/radeon_kms.c b/src/radeon_kms.c
index 4ff1c6a..59a654f 100644
--- a/src/radeon_kms.c
+++ b/src/radeon_kms.c
@@ -73,12 +73,17 @@ const OptionInfoRec RADEONOptions_KMS[] = {
 void radeon_cs_flush_indirect(ScrnInfoPtr pScrn)
 {
     RADEONInfoPtr  info = RADEONPTR(pScrn);
+    int ret;
 
     if (!info->cs->cdw)
 	return;
     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");
+
     if (info->reemit_current2d)
       info->reemit_current2d(pScrn, 0);
     if (info->dri2.enabled) {
@@ -92,14 +97,10 @@ void radeon_ddx_cs_start(ScrnInfoPtr pScrn,
 			 const char *func, int line)
 {
     RADEONInfoPtr  info = RADEONPTR(pScrn);
-    int ret;
 
     if (info->cs->cdw + n > info->cs->ndw) {
 	radeon_cs_flush_indirect(pScrn);
-	ret = radeon_cs_space_check(info->cs);
-	if (ret)
-	    ErrorF("space check failed in DDX CS start %s:%s:%d\n",
-		   file, func, line);
+
     }
     radeon_cs_begin(info->cs, n, file, func, line);
 }