[PATCH xf86-video-amdgpu 3/6] Check for xf86CursorResetCursor

Michel Dänzer michel at daenzer.net
Thu Mar 24 10:14:27 UTC 2016


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

If it's available, Xorg calls it on each mode configuration change. It
does what xf86_reload_cursors does (and more), so we don't need to call
the latter anymore.

(Ported from radeon commit d670c5c9851b4eff21c845d26c7d7e4eb5ee0fa9)

Signed-off-by: Michel Dänzer <michel.daenzer at amd.com>
---
 configure.ac          | 6 ++++++
 src/drmmode_display.c | 2 ++
 2 files changed, 8 insertions(+)

diff --git a/configure.ac b/configure.ac
index fb07e89..1deab68 100644
--- a/configure.ac
+++ b/configure.ac
@@ -163,6 +163,12 @@ AC_CHECK_DECL(fbGlyphs,
 	       #include <glyphstr.h>
 	       #include <fbpict.h>])
 
+AC_CHECK_DECL(xf86CursorResetCursor,
+	      [AC_DEFINE(HAVE_XF86_CURSOR_RESET_CURSOR, 1,
+	      [Have xf86CursorResetCursor API])], [],
+	      [#include <xorg-server.h>
+	       #include <xf86Cursor.h>])
+
 AC_CHECK_DECL(xorg_list_init,
 	      [AC_DEFINE(HAVE_XORG_LIST, 1, [Have xorg_list API])], [],
 	      [#include <X11/Xdefs.h>
diff --git a/src/drmmode_display.c b/src/drmmode_display.c
index 2406959..4240a43 100644
--- a/src/drmmode_display.c
+++ b/src/drmmode_display.c
@@ -812,8 +812,10 @@ drmmode_set_mode_major(xf86CrtcPtr crtc, DisplayModePtr mode,
 		break;
 	}
 
+#ifndef HAVE_XF86_CURSOR_RESET_CURSOR
 	if (!info->hwcursor_disabled)
 		xf86_reload_cursors(pScreen);
+#endif
 
 done:
 	free(output_ids);
-- 
2.8.0.rc3



More information about the xorg-driver-ati mailing list