xf86-video-ati: Branch 'master'

[Michel Dänzer]

 src/radeon_exa_render.c |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit e59ae08270711512e64b70f79b6476cc2c52d230
Author: Michel Dänzer <daenzer at vmware.com>
Date:   Tue Oct 6 00:13:09 2009 +0200

    Don't call radeon_cs_flush_indirect() without KMS.
    
    Fixes http://bugs.freedesktop.org/show_bug.cgi?id=24316 .

diff --git a/src/radeon_exa_render.c b/src/radeon_exa_render.c
index cf1914d..7ae0d1f 100644
--- a/src/radeon_exa_render.c
+++ b/src/radeon_exa_render.c
@@ -2179,7 +2179,10 @@ static void FUNC_NAME(RadeonCompositeTile)(ScrnInfoPtr pScrn,
 	(!info->cs && (info->cp->indirectBuffer->used + 4 * 32) >
 	 info->cp->indirectBuffer->total)) {
 	FUNC_NAME(RadeonDoneComposite)(info->accel_state->dst_pix);
-	radeon_cs_flush_indirect(pScrn);
+	if (info->cs)
+	    radeon_cs_flush_indirect(pScrn);
+	else
+	    RADEONCPFlushIndirect(pScrn, 1);
 	info->accel_state->exa->PrepareComposite(info->accel_state->composite_op,
 						 info->accel_state->src_pic,
 						 info->accel_state->msk_pic,