xf86-video-ati: Branch 'master'

[Michel Dänzer]

 src/radeon_glamor_wrappers.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit e58fc380ccf2a581d28f041fd74b963626ca5404
Author: Michel Dänzer <michel.daenzer at amd.com>
Date:   Thu May 28 10:59:22 2015 +0900

    glamor: Only wait for GPU writes in radeon_glamor_prepare_access_cpu_ro
    
    We don't need to wait for GPU reads to finish before reading with the
    CPU.
    
    Reviewed-by: Alex Deucher <alexander.deucher at amd.com>

diff --git a/src/radeon_glamor_wrappers.c b/src/radeon_glamor_wrappers.c
index 7a57bc1..ec81560 100644
--- a/src/radeon_glamor_wrappers.c
+++ b/src/radeon_glamor_wrappers.c
@@ -113,7 +113,7 @@ radeon_glamor_prepare_access_cpu_ro(ScrnInfoPtr scrn, PixmapPtr pixmap,
 		return TRUE;
 
 	info = RADEONPTR(scrn);
-	need_sync = radeon_glamor_gpu_pending(info->gpu_synced, priv->gpu_read);
+	need_sync = radeon_glamor_gpu_pending(info->gpu_synced, priv->gpu_write);
 	return radeon_glamor_prepare_access_cpu(scrn, RADEONPTR(scrn), pixmap,
 						priv, need_sync);
 }