xf86-video-ati: Branch 'master'

[Alex Deucher]

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

New commits:
commit 62a4cd180fe884dca24586d453395472516e6496
Author: Alex Deucher <alexdeucher at gmail.com>
Date:   Wed May 4 01:13:55 2011 -0400

    fusion: fix tiling enable logic
    
    Signed-off-by: Alex Deucher <alexdeucher at gmail.com>

diff --git a/src/radeon_kms.c b/src/radeon_kms.c
index 459ca68..aac17e2 100644
--- a/src/radeon_kms.c
+++ b/src/radeon_kms.c
@@ -670,18 +670,18 @@ Bool RADEONPreInit_KMS(ScrnInfoPtr pScrn, int flags)
 	    info->group_bytes = 256;
 	    info->have_tiling_info = FALSE;
 	    if (info->dri->pKernelDRMVersion->version_minor >= 6) {
-		if (r600_get_tile_config(pScrn))
+		if (r600_get_tile_config(pScrn)) {
 		    info->allowColorTiling = xf86ReturnOptValBool(info->Options,
 								  OPTION_COLOR_TILING, colorTilingDefault);
-		else
+		    /* need working DFS for tiling */
+		    if ((info->ChipFamily == CHIP_FAMILY_PALM) &&
+			(!info->accel_state->allowHWDFS))
+			info->allowColorTiling = FALSE;
+		} else
 		    info->allowColorTiling = FALSE;
 	    } else
 		xf86DrvMsg(pScrn->scrnIndex, X_INFO,
 			   "R6xx+ KMS Color Tiling requires radeon drm 2.6.0 or newer\n");
-
-	    /* need working DFS for tiling */
-	    if (info->ChipFamily == CHIP_FAMILY_PALM)
-		info->allowColorTiling = info->accel_state->allowHWDFS;
 	} else
 	    info->allowColorTiling = xf86ReturnOptValBool(info->Options,
 							  OPTION_COLOR_TILING, colorTilingDefault);