xf86-video-ati: Branch 'master'

[Alex Deucher]

 src/radeon_kms.c |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

New commits:
commit e5bd99faa3b6629a55168386d5dfa936ee4e97ae
Author: Alex Deucher <alexdeucher at gmail.com>
Date:   Fri Feb 11 12:14:55 2011 -0500

    kms: remove RADEON_TILING_SURFACE flag on front bo
    
    Should have been removed in:
    ef9bfb262db7004bef3704e5d914687e50d3fca4
    
    Signed-off-by: Alex Deucher <alexdeucher at gmail.com>

diff --git a/src/radeon_kms.c b/src/radeon_kms.c
index 4297f6b..65d62c2 100644
--- a/src/radeon_kms.c
+++ b/src/radeon_kms.c
@@ -1190,10 +1190,8 @@ static Bool radeon_setup_kernel_mem(ScreenPtr pScreen)
 	    break;
 	}
 #endif
-	if (tiling_flags) {
-            radeon_bo_set_tiling(info->front_bo,
-				 tiling_flags | RADEON_TILING_SURFACE, pitch);
-	}
+	if (tiling_flags)
+            radeon_bo_set_tiling(info->front_bo, tiling_flags, pitch);
     }
 
     xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Front buffer size: %dK\n", info->front_bo->size/1024);