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

[Alex Deucher]

 configure.ac     |    2 +-
 src/radeon_kms.c |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 5eee8a4d5c86bb1cc34d8caf2f2b64b53c241fa5
Author: Alex Deucher <alexander.deucher at amd.com>
Date:   Mon Mar 10 16:20:09 2014 -0400

    radeon: enable tiling by default on CIK
    
    Now that mesa 10.1 is released, we can enable this by
    default for CIK parts.  Tiling improves memory bandwidth
    utilization.
    
    Signed-off-by: Alex Deucher <alexander.deucher at amd.com>
    Reviewed-by: Michel Dänzer <michel.daenzer at amd.com>

diff --git a/src/radeon_kms.c b/src/radeon_kms.c
index 4a6c38e..4f1f5ee 100644
--- a/src/radeon_kms.c
+++ b/src/radeon_kms.c
@@ -868,13 +868,13 @@ Bool RADEONPreInit_KMS(ScrnInfoPtr pScrn, int flags)
 	     * with proper bit, in the meantime you need to set tiling option in
 	     * xorg configuration files
 	     */
-	    info->ChipFamily <= CHIP_FAMILY_HAINAN &&
+	    info->ChipFamily <= CHIP_FAMILY_HAWAII &&
 	    !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_HAINAN);
+                                                                info->ChipFamily <= CHIP_FAMILY_HAWAII);
 	}
 
 	if (info->ChipFamily >= CHIP_FAMILY_R600) {
commit 691ec3d99c30111a4789830dfccb6eb5d3c40187
Author: Alex Deucher <alexander.deucher at amd.com>
Date:   Mon Mar 10 16:17:34 2014 -0400

    radeon: require libdrm 2.4.51
    
    Required for proper tiling support on CIK parts.
    
    Signed-off-by: Alex Deucher <alexander.deucher at amd.com>
    Reviewed-by: Michel Dänzer <michel.daenzer at amd.com>

diff --git a/configure.ac b/configure.ac
index 200f979..e80de84 100644
--- a/configure.ac
+++ b/configure.ac
@@ -71,7 +71,7 @@ XORG_DRIVER_CHECK_EXT(XV, videoproto)
 XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto)
 
 # Checks for libraries.
-PKG_CHECK_MODULES(LIBDRM, [libdrm >= 2.4.46])
+PKG_CHECK_MODULES(LIBDRM, [libdrm >= 2.4.51])
 PKG_CHECK_MODULES(LIBDRM_RADEON, [libdrm_radeon])
 
 # Obtain compiler/linker options for the driver dependencies