xf86-video-ati: Branch 'master'

[Michel Dänzer]

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

New commits:
commit 794ae743c305331741e7cf45dd71c755fe325ed5
Author: Michel Dänzer <daenzer at vmware.com>
Date:   Wed Sep 2 09:19:17 2009 +0200

    EXA: Fix Composite restart dst/src switcheroo.
    
    Fixes http://bugs.freedesktop.org/show_bug.cgi?id=22636 .
    
    Now, where's that brown paper bag? :}

diff --git a/src/radeon_exa_render.c b/src/radeon_exa_render.c
index c3beadc..f842b97 100644
--- a/src/radeon_exa_render.c
+++ b/src/radeon_exa_render.c
@@ -2128,12 +2128,12 @@ static void FUNC_NAME(RadeonCompositeTile)(ScrnInfoPtr pScrn,
 	FUNC_NAME(RadeonDoneComposite)(info->accel_state->dst_pix);
 	radeon_cs_flush_indirect(pScrn);
 	info->accel_state->exa->PrepareComposite(info->accel_state->composite_op,
-						 info->accel_state->dst_pic,
-						 info->accel_state->msk_pic,
 						 info->accel_state->src_pic,
-						 info->accel_state->dst_pix,
+						 info->accel_state->msk_pic,
+						 info->accel_state->dst_pic,
+						 info->accel_state->src_pix,
 						 info->accel_state->msk_pix,
-						 info->accel_state->src_pix);
+						 info->accel_state->dst_pix);
     }
 #endif