xf86-video-ati: Branch 'master'

[Alex Deucher]

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

New commits:
commit 481baa5c74271cd7ce38bae3965d2bc4b8809058
Author: Alex Deucher <alexdeucher at gmail.com>
Date:   Mon Jun 13 12:44:07 2011 -0400

    kms: enable ColorTiling by default on r6xx-cayman asics
    
    Currently only 1D tiling as 2D tiling still has some corner
    cases to fix up.
    
    Signed-off-by: Alex Deucher <alexdeucher at gmail.com>

diff --git a/src/radeon_kms.c b/src/radeon_kms.c
index ebbe30f..aa4b1e3 100644
--- a/src/radeon_kms.c
+++ b/src/radeon_kms.c
@@ -662,7 +662,7 @@ Bool RADEONPreInit_KMS(ScrnInfoPtr pScrn, int flags)
     /* don't enable tiling if accel is not enabled */
     if (!info->r600_shadow_fb) {
 	colorTilingDefault = info->ChipFamily >= CHIP_FAMILY_R300 &&
-	    info->ChipFamily <= CHIP_FAMILY_RS740;
+	    info->ChipFamily <= CHIP_FAMILY_CAYMAN;
 
 	if (info->ChipFamily >= CHIP_FAMILY_R600) {
 	    /* set default group bytes, overridden by kernel info below */