xf86-video-ati: Branch 'master'

[Michel Dänzer]

 src/radeon_kms.c |   10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

New commits:
commit d611d21d9bf9aaa100ff7a5762e5980634846207
Author: Michel Dänzer <michel.daenzer at amd.com>
Date:   Tue Jan 24 18:05:45 2017 +0900

    Enable tiling by default with glamor on PALM
    
    The DFS check is only relevant for EXA.
    
    The lack of tiling prevented DRI3 clients from using page flipping,
    resulting in tearing.
    
    Bugzilla: https://bugs.freedesktop.org/99491
    Reviewed-by: Alex Deucher <alexander.deucher at amd.com>

diff --git a/src/radeon_kms.c b/src/radeon_kms.c
index 48dec96..4468525 100644
--- a/src/radeon_kms.c
+++ b/src/radeon_kms.c
@@ -1741,10 +1741,12 @@ Bool RADEONPreInit_KMS(ScrnInfoPtr pScrn, int flags)
 		if (r600_get_tile_config(pScrn)) {
 		    info->allowColorTiling = xf86ReturnOptValBool(info->Options,
 								  OPTION_COLOR_TILING, colorTilingDefault);
-		    /* need working DFS for tiling */
-		    if ((info->ChipFamily == CHIP_FAMILY_PALM) &&
-			(!info->accel_state->allowHWDFS))
-			info->allowColorTiling = FALSE;
+		    if (!info->use_glamor) {
+			/* need working DFS for tiling */
+			if (info->ChipFamily == CHIP_FAMILY_PALM &&
+			    !info->accel_state->allowHWDFS)
+			    info->allowColorTiling = FALSE;
+		    }
 		} else
 		    info->allowColorTiling = FALSE;
 	    } else