xf86-video-ati: Branch 'master'

[Alex Deucher]

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

New commits:
commit 76638ca687b02d3b1494b9868f817fd4fd892c64
Author: Alex Deucher <alexdeucher at gmail.com>
Date:   Wed May 4 01:06:22 2011 -0400

    fusion: enable tiling if DFS works
    
    Signed-off-by: Alex Deucher <alexdeucher at gmail.com>

diff --git a/src/radeon_kms.c b/src/radeon_kms.c
index b8fcb99..459ca68 100644
--- a/src/radeon_kms.c
+++ b/src/radeon_kms.c
@@ -679,9 +679,9 @@ Bool RADEONPreInit_KMS(ScrnInfoPtr pScrn, int flags)
 		xf86DrvMsg(pScrn->scrnIndex, X_INFO,
 			   "R6xx+ KMS Color Tiling requires radeon drm 2.6.0 or newer\n");
 
-	    /* don't support tiling on APUs yet */
+	    /* need working DFS for tiling */
 	    if (info->ChipFamily == CHIP_FAMILY_PALM)
-		info->allowColorTiling = FALSE;
+		info->allowColorTiling = info->accel_state->allowHWDFS;
 	} else
 	    info->allowColorTiling = xf86ReturnOptValBool(info->Options,
 							  OPTION_COLOR_TILING, colorTilingDefault);