xf86-video-ati: Branch 'master'

[Michel Dänzer]

 src/drmmode_display.c |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

New commits:
commit d016f20b14ffe4f90f7457375b2d9f5cf0f5650f
Author: Michel Dänzer <michel.daenzer at amd.com>
Date:   Thu Oct 13 16:33:45 2016 +0900

    Restore location of radeon_set_pixmap_bo call in drmmode_create_bo_pixmap
    
    radeon_set_pixmap_bo sets the tiling flags, so it needs to be called
    before radeon_get_pixmap_tiling_flags. Fixes a regression with EXA and
    TearFree.
    
    Fixes: 8523a733b6a5 ("Propagate failure from radeon_set_pixmap_bo")
    Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=98097
    Reviewed-by: Alex Deucher <alexander.deucher at amd.com>

diff --git a/src/drmmode_display.c b/src/drmmode_display.c
index 3888e5c..8f62cae 100644
--- a/src/drmmode_display.c
+++ b/src/drmmode_display.c
@@ -131,6 +131,10 @@ static PixmapPtr drmmode_create_bo_pixmap(ScrnInfoPtr pScrn,
 
 	if (!info->use_glamor)
 		exaMoveInPixmap(pixmap);
+
+	if (!radeon_set_pixmap_bo(pixmap, bo))
+		goto fail;
+
 	if (info->ChipFamily >= CHIP_FAMILY_R600) {
 		surface = radeon_get_pixmap_surface(pixmap);
 		if (surface && psurf) 
@@ -170,9 +174,6 @@ static PixmapPtr drmmode_create_bo_pixmap(ScrnInfoPtr pScrn,
 		}
 	}
 
-	if (!radeon_set_pixmap_bo(pixmap, bo))
-		goto fail;
-
 	if (!info->use_glamor ||
 	    radeon_glamor_create_textured_pixmap(pixmap,
 						 radeon_get_pixmap_private(pixmap)))