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

[Michel Dänzer]

 man/amdgpu.man        |    7 +++++++
 src/drmmode_display.c |   11 ++++++++++-
 2 files changed, 17 insertions(+), 1 deletion(-)

New commits:
commit 0a6ba4bf50128464a30951721b0c72e748fb89bc
Author: Darren Powell <darren.powell at amd.com>
Date:   Tue Oct 20 16:56:54 2015 -0400

    Add Option "TearFree" to manpage
    
    This was missed in commit c57da33308a81fa575179238a0415abcb8b34908.
    
    Signed-off-by: Darren Powell <darren.powell at amd.com>
    Reviewed-by: Alex Deucher <alexander.deucher at amd.com>
    Reviewed-by: Michel Dänzer <michel.daenzer at amd.com>

diff --git a/man/amdgpu.man b/man/amdgpu.man
index 0233445..3373b63 100644
--- a/man/amdgpu.man
+++ b/man/amdgpu.man
@@ -71,6 +71,13 @@ The default is
 Enable DRI2 page flipping.  The default is
 .B on.
 .TP
+.BI "Option \*qTearFree\*q \*q" boolean \*q
+Enable tearing prevention using the hardware page flipping mechanism. This
+option currently doesn't have any effect for rotated CRTCs. It requires
+allocating two separate scanout buffers for each non-rotated CRTC. Enabling
+this option currently disables Option \*qEnablePageFlip\*q. The default is
+.B off.
+.TP
 .BI "Option \*qAccelMethod\*q \*q" string \*q
 Setting this option to
 .B none
commit 175251645fec1a3d19f498e1cd1e655374c67801
Author: Michel Dänzer <michel.daenzer at amd.com>
Date:   Thu Oct 15 16:35:51 2015 +0900

    Handle RandR CRTC transforms properly

diff --git a/src/drmmode_display.c b/src/drmmode_display.c
index 4193be4..8393499 100644
--- a/src/drmmode_display.c
+++ b/src/drmmode_display.c
@@ -607,7 +607,6 @@ drmmode_set_mode_major(xf86CrtcPtr crtc, DisplayModePtr mode,
 		crtc->x = x;
 		crtc->y = y;
 		crtc->rotation = rotation;
-		crtc->transformPresent = FALSE;
 
 		output_ids = calloc(sizeof(uint32_t), xf86_config->num_output);
 		if (!output_ids) {
@@ -778,6 +777,15 @@ static void drmmode_load_cursor_argb(xf86CrtcPtr crtc, CARD32 * image)
 	}
 }
 
+static Bool drmmode_load_cursor_argb_check(xf86CrtcPtr crtc, CARD32 * image)
+{
+	if (crtc->transformPresent)
+		return FALSE;
+
+	drmmode_load_cursor_argb(crtc, image);
+	return TRUE;
+}
+
 static void drmmode_hide_cursor(xf86CrtcPtr crtc)
 {
 	ScrnInfoPtr pScrn = crtc->scrn;
@@ -925,6 +933,7 @@ static xf86CrtcFuncsRec drmmode_crtc_funcs = {
 	.show_cursor = drmmode_show_cursor,
 	.hide_cursor = drmmode_hide_cursor,
 	.load_cursor_argb = drmmode_load_cursor_argb,
+	.load_cursor_argb_check = drmmode_load_cursor_argb_check,
 
 	.gamma_set = drmmode_crtc_gamma_set,
 	.shadow_create = drmmode_crtc_shadow_create,