xf86-video-amdgpu: Branch 'master'

[Michel Dänzer]

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

New commits:
commit 7cc04035c55788261cda89a915c433c2add6cad9
Author: Michel Dänzer <michel.daenzer at amd.com>
Date:   Wed Sep 28 15:59:22 2016 +0900

    Enable HW cursor support with PRIME slave output & Xorg > 1.18.99.901
    
    Supported since Xorg 1.18.99.2, but buggy until 1.18.99.901.
    
    Reviewed-by: Alex Deucher <alexander.deucher at amd.com>

diff --git a/src/drmmode_display.c b/src/drmmode_display.c
index fb41975..f291f6d 100644
--- a/src/drmmode_display.c
+++ b/src/drmmode_display.c
@@ -611,8 +611,9 @@ drmmode_can_use_hw_cursor(xf86CrtcPtr crtc)
 		return FALSE;
 #endif
 
-#ifdef AMDGPU_PIXMAP_SHARING
-	/* HW cursor not supported yet with RandR 1.4 multihead */
+#if defined(AMDGPU_PIXMAP_SHARING) && \
+	XORG_VERSION_CURRENT <= XORG_VERSION_NUMERIC(1,18,99,901,0)
+	/* HW cursor not supported with RandR 1.4 multihead */
 	if (!xorg_list_is_empty(&crtc->scrn->pScreen->pixmap_dirty_list))
 		return FALSE;
 #endif