xf86-video-ati: Branch 'master' - 2 commits

[Alex Deucher]

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

New commits:
commit 2e96aa641bc8a5c263a5b643961383cdf530d044
Author: Marek Olšák <maraeo at gmail.com>
Date:   Sun Oct 28 12:50:49 2012 -0400

    radeon: turn on 2D tiling by default on r6xx-cayman
    
    Signed-off-by: Alex Deucher <alexdeucher at gmail.com>

diff --git a/src/radeon_kms.c b/src/radeon_kms.c
index dc238b7..261e1cb 100644
--- a/src/radeon_kms.c
+++ b/src/radeon_kms.c
@@ -828,7 +828,8 @@ Bool RADEONPreInit_KMS(ScrnInfoPtr pScrn, int flags)
 
 	/* 2D color tiling */
 	if (info->ChipFamily >= CHIP_FAMILY_R600) {
-		info->allowColorTiling2D = xf86ReturnOptValBool(info->Options, OPTION_COLOR_TILING_2D, FALSE);
+		info->allowColorTiling2D = xf86ReturnOptValBool(info->Options, OPTION_COLOR_TILING_2D,
+                                                                info->ChipFamily <= CHIP_FAMILY_ARUBA);
 	}
 
 	if (info->ChipFamily >= CHIP_FAMILY_R600) {
commit e830c039479539735d0836082abef24f6841c803
Author: Marek Olšák <maraeo at gmail.com>
Date:   Sun Oct 28 12:49:15 2012 -0400

    radeon: log if 2D tiling is enabled
    
    Signed-off-by: Alex Deucher <alexdeucher at gmail.com>

diff --git a/src/radeon_kms.c b/src/radeon_kms.c
index 0a10bee..dc238b7 100644
--- a/src/radeon_kms.c
+++ b/src/radeon_kms.c
@@ -860,6 +860,8 @@ Bool RADEONPreInit_KMS(ScrnInfoPtr pScrn, int flags)
 
     xf86DrvMsg(pScrn->scrnIndex, X_INFO,
 	 "KMS Color Tiling: %sabled\n", info->allowColorTiling ? "en" : "dis");
+    xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+	 "KMS Color Tiling 2D: %sabled\n", info->allowColorTiling2D ? "en" : "dis");
 
     if (info->dri2.pKernelDRMVersion->version_minor >= 8) {
 	info->allowPageFlip = xf86ReturnOptValBool(info->Options,