xf86-video-ati: Branch 'master'

[Jerome Glisse]

 src/r6xx_accel.c |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit a3b730eceb522c7ac1ef3dd6f6c7d773118d03f7
Author: Jerome Glisse <jglisse at redhat.com>
Date:   Thu Feb 18 14:13:48 2010 +0100

    r6xx/kms: when reseting BO force default state emission
    
    In KMS world each cs need to fully initialize the 3D engine
    when we were erasing cs in IBDiscard for r6xx we weren't
    forcing reemission of default state. This patch force this
    emission. Fix :
    
    http://bugs.freedesktop.org/show_bug.cgi?id=26603
    http://bugzilla.kernel.org/show_bug.cgi?id=15284

diff --git a/src/r6xx_accel.c b/src/r6xx_accel.c
index c0be4d5..a069530 100644
--- a/src/r6xx_accel.c
+++ b/src/r6xx_accel.c
@@ -109,6 +109,10 @@ void R600IBDiscard(ScrnInfoPtr pScrn, drmBufPtr ib)
 	ret = radeon_cs_space_check(info->cs);
 	if (ret)
 	    ErrorF("space check failed in flush\n");
+	if (info->dri2.enabled) {
+		info->accel_state->XInited3D = FALSE;
+		info->accel_state->engineMode = EXA_ENGINEMODE_UNKNOWN;
+	}
     }
 #endif
     if (!ib) return;