xf86-video-ati: Branch 'master'

[Alex Deucher]

 man/radeon.man   |    6 +++---
 src/radeon_kms.c |    6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit e4cd0f4392ea11c93088ad429f36eaaf9bcbf505
Author: Alex Deucher <alexander.deucher at amd.com>
Date:   Wed Oct 30 15:21:26 2013 -0400

    radeon: enable tiling on SI by default (v2)
    
    Now that mesa 9.2 is out with support for tiling
    on SI asics, we can enable it here. Tiling improves
    memory bandwidth utilization.
    
    V2: update man page
    
    Signed-off-by: Alex Deucher <alexander.deucher at amd.com>

diff --git a/man/radeon.man b/man/radeon.man
index 40a38ec..b642e45 100644
--- a/man/radeon.man
+++ b/man/radeon.man
@@ -245,7 +245,7 @@ this enables 1D tiling mode.
 The default value is
 .B on
 for R/RV3XX, R/RV4XX, R/RV5XX, RS6XX, RS740, R/RV6XX, R/RV7XX, RS780, RS880,
-EVERGREEN, CAYMAN, and ARUBA and
+EVERGREEN, CAYMAN, ARUBA, and Southern Islands and
 .B off
 for R/RV/RS1XX, R/RV/RS2XX, RS3XX, and RS690/RS780/RS880 when fast fb feature is enabled.
 .TP
@@ -254,11 +254,11 @@ The framebuffer can be addressed either in linear, 1D, or 2D tiled modes. 2D til
 provide significant performance benefits over 1D tiling with 3D applications.  Tiling
 will be disabled if the drm module is too old or if the current display configuration
 does not support it. KMS ColorTiling2D is only supported on R600 and newer chips and requires
-Mesa 9.0 or newer.
+Mesa 9.0 or newer for R6xx-ARUBA and Mesa 9.2 or newer for Southern Islands.
 .br
 The default value is
 .B on
-for R/RV6XX, R/RV7XX, RS780, RS880, EVERGREEN, CAYMAN, and ARUBA.
+for R/RV6XX, R/RV7XX, RS780, RS880, EVERGREEN, CAYMAN, ARUBA, and Southern Islands.
 .TP
 .BI "Option \*qEnablePageFlip\*q \*q" boolean \*q
 Enable DRI2 page flipping.  The default is
diff --git a/src/radeon_kms.c b/src/radeon_kms.c
index 255906b..5b85acc 100644
--- a/src/radeon_kms.c
+++ b/src/radeon_kms.c
@@ -860,17 +860,17 @@ Bool RADEONPreInit_KMS(ScrnInfoPtr pScrn, int flags)
 	Bool colorTilingDefault =
 	    xorgGetVersion() >= XORG_VERSION_NUMERIC(1,9,4,901,0) &&
 	    info->ChipFamily >= CHIP_FAMILY_R300 &&
-	    /* this ARUBA check could be removed sometime after a big mesa release
+	    /* this check could be removed sometime after a big mesa release
 	     * with proper bit, in the meantime you need to set tiling option in
 	     * xorg configuration files
 	     */
-	    info->ChipFamily <= CHIP_FAMILY_ARUBA &&
+	    info->ChipFamily <= CHIP_FAMILY_HAINAN &&
 	    !info->is_fast_fb;
 
 	/* 2D color tiling */
 	if (info->ChipFamily >= CHIP_FAMILY_R600) {
 		info->allowColorTiling2D = xf86ReturnOptValBool(info->Options, OPTION_COLOR_TILING_2D,
-                                                                info->ChipFamily <= CHIP_FAMILY_ARUBA);
+                                                                info->ChipFamily <= CHIP_FAMILY_HAINAN);
 	}
 
 	if (info->ChipFamily >= CHIP_FAMILY_R600) {