xf86-video-ati: Branch 'master'

[Alex Deucher]

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

New commits:
commit 8567b8cd9e136ef69906e02286b3752db2404741
Author: Alex Deucher <alexdeucher at gmail.com>
Date:   Tue Mar 15 13:13:06 2011 -0400

    APU: no tiling yet
    
    Signed-off-by: Alex Deucher <alexdeucher at gmail.com>

diff --git a/src/radeon_kms.c b/src/radeon_kms.c
index 125a132..0760170 100644
--- a/src/radeon_kms.c
+++ b/src/radeon_kms.c
@@ -651,6 +651,10 @@ Bool RADEONPreInit_KMS(ScrnInfoPtr pScrn, int flags)
 	    } else
 		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 */
+	    if (info->ChipFamily == CHIP_FAMILY_PALM)
+		info->allowColorTiling = FALSE;
 	} else
 	    info->allowColorTiling = xf86ReturnOptValBool(info->Options,
 							  OPTION_COLOR_TILING, colorTilingDefault);