xf86-video-ati: Branch 'master'

[Dave Airlie]

 src/radeon_kms.c |    7 +++++++
 1 file changed, 7 insertions(+)

New commits:
commit 503b51343267248b4c6994b88238dd5384528f03
Author: Dave Airlie <airlied at redhat.com>
Date:   Mon Jul 6 15:20:13 2009 +1000

    radeon: taken from kms-support + CS fixes commit.
    
    re-emit 2D state and reset 3D state emit on flush

diff --git a/src/radeon_kms.c b/src/radeon_kms.c
index 7ecfe88..4ff1c6a 100644
--- a/src/radeon_kms.c
+++ b/src/radeon_kms.c
@@ -78,6 +78,13 @@ void radeon_cs_flush_indirect(ScrnInfoPtr pScrn)
 	return;
     radeon_cs_emit(info->cs);
     radeon_cs_erase(info->cs);
+
+    if (info->reemit_current2d)
+      info->reemit_current2d(pScrn, 0);
+    if (info->dri2.enabled) {
+      info->accel_state->XInited3D = FALSE;
+      info->accel_state->engineMode = EXA_ENGINEMODE_UNKNOWN;
+    }
 }
 
 void radeon_ddx_cs_start(ScrnInfoPtr pScrn,