xf86-video-ati: Branch 'master'

[Michel Dänzer]

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

New commits:
commit c16c59f8f9b6aa7a4a6a6465582ad98f02a3606a
Author: Mark Kettenis <kettenis at openbsd.org>
Date:   Sun Jul 7 13:44:13 2013 +0200

    Always go through DFS/UTS when byte swapping is needed.
    
    Before commit ef9bfb262db7004bef3704e5d914687e50d3fca4 and
    e5bd99faa3b6629a55168386d5dfa936ee4e97ae, byte swapping for the front buffer
    used to be done in hardware.  Now that this no longer happens we need to let
    DFS/UTS ihandle the byte swapping.
    
    See https://bugs.freedesktop.org/show_bug.cgi?id=66663 .
    
    Signed-off-by: Mark Kettenis <kettenis at openbsd.org>

diff --git a/src/radeon_exa.c b/src/radeon_exa.c
index fcafb68..cf368d5 100644
--- a/src/radeon_exa.c
+++ b/src/radeon_exa.c
@@ -172,7 +172,7 @@ Bool RADEONPrepareAccess_CS(PixmapPtr pPix, int index)
 
 #if X_BYTE_ORDER == X_BIG_ENDIAN
     /* May need to handle byte swapping in DownloadFrom/UploadToScreen */
-    if (can_fail && pPix->drawable.bitsPerPixel > 8)
+    if (pPix->drawable.bitsPerPixel > 8)
 	return FALSE;
 #endif