xf86-video-ati: Branch 'master'

[Michel Dänzer]

 src/radeon_exa_shared.c |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit b0b7d8d26fd107df342b5c87b0a38e5bb08101a9
Author: Michel Dänzer <michel.daenzer at amd.com>
Date:   Wed May 9 11:08:49 2012 +0200

    EXA/UMS: Synchronize to the GPU before writing solid colour to scratch pixmap.
    
    UMS doesn't do this automagically. It's a big hammer that will probably suck
    for performance, but I don't have any better ideas right now.
    
    Signed-off-by: Michel Dänzer <michel.daenzer at amd.com>

diff --git a/src/radeon_exa_shared.c b/src/radeon_exa_shared.c
index 31e2870..45222b5 100644
--- a/src/radeon_exa_shared.c
+++ b/src/radeon_exa_shared.c
@@ -157,6 +157,7 @@ PixmapPtr RADEONSolidPixmap(ScreenPtr pScreen, uint32_t solid)
 	return NULL;
     }
 
+    info->accel_state->exa->WaitMarker(pScreen, info->accel_state->exaSyncMarker);
     memcpy(info->FB + exaGetPixmapOffset(pPix), &solid, 4);
 
     return pPix;