xf86-video-ati: Branch 'master'

[Michel Dänzer]

 src/drmmode_display.c |    6 ++++++
 1 file changed, 6 insertions(+)

New commits:
commit 7d7abf99b5441ddb04dbee99bc8fa7abc30d4c46
Author: Michel Dänzer <michel.daenzer at amd.com>
Date:   Wed Jul 26 18:13:35 2017 +0900

    Only handle reflection in the driver with Xorg < 1.16
    
    Xorg doesn't handle the hardware cursor correctly in that case for
    rotation and general transforms, and we can't force the SW cursor.
    
    Fixes: f2bc882f1c10 ("Handle rotation in the driver also with Xorg
                          1.12-1.18")
    Reviewed-by: Alex Deucher <alexander.deucher at amd.com>

diff --git a/src/drmmode_display.c b/src/drmmode_display.c
index 840071fe..245a92fb 100644
--- a/src/drmmode_display.c
+++ b/src/drmmode_display.c
@@ -677,10 +677,16 @@ drmmode_handle_transform(xf86CrtcPtr crtc)
 {
 	Bool ret;
 
+#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(1,15,99,903,0)
 	if (crtc->transformPresent || crtc->rotation != RR_Rotate_0)
 	    crtc->driverIsPerformingTransform = XF86DriverTransformOutput;
 	else
 	    crtc->driverIsPerformingTransform = XF86DriverTransformNone;
+#else
+	crtc->driverIsPerformingTransform = !crtc->transformPresent &&
+		crtc->rotation != RR_Rotate_0 &&
+		(crtc->rotation & 0xf) == RR_Rotate_0;
+#endif
 
 	ret = xf86CrtcRotate(crtc);