[PATCH xf86-video-omap] Adapt to XF86_CRTC_VERSION 7

Michel Dänzer michel at daenzer.net
Tue May 31 08:55:04 UTC 2016


From: Michel Dänzer <michel.daenzer at amd.com>

The driverIsPerformingTransform field becomes an enum, and
xf86CrtcTransformCursorPos is no longer necessary.

Signed-off-by: Michel Dänzer <michel.daenzer at amd.com>
---

Unless there are any objections, I'll push this soon so that the
corresponding xserver change (https://patchwork.freedesktop.org/patch/78319/)
can land.

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

diff --git a/src/drmmode_display.c b/src/drmmode_display.c
index b365212..3891e13 100644
--- a/src/drmmode_display.c
+++ b/src/drmmode_display.c
@@ -242,7 +242,11 @@ drmmode_set_rotation(xf86CrtcPtr crtc, Rotation rotation)
 			return FALSE;
 		}
 
+#if XF86_CRTC_VERSION >= 7
+		crtc->driverIsPerformingTransform = XF86DriverTransformOutput;
+#else
 		crtc->driverIsPerformingTransform = TRUE;
+#endif
 	}
 #endif
 	return xf86CrtcRotate(crtc);
@@ -464,7 +468,7 @@ drmmode_show_cursor(xf86CrtcPtr crtc)
 		h = crtc->mode.VDisplay - crtc_y;
 	}
 
-#if XF86_CRTC_VERSION >= 4
+#if XF86_CRTC_VERSION >= 4 && XF86_CRTC_VERSION < 7
 	/* NOTE: driver is taking care of rotation in hw, which means
 	 * we need to deal w/ transformation of mouse cursor ourself:
 	 */
-- 
2.8.1



More information about the xorg-devel mailing list