summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichel Dänzer <michel.daenzer@amd.com>2016-03-18 16:46:08 +0900
committerMichel Dänzer <michel@daenzer.net>2016-03-23 16:54:24 +0900
commitd670c5c9851b4eff21c845d26c7d7e4eb5ee0fa9 (patch)
treecc90107e5160221e3834b651b0f41a0d929506fd
parent7f3d0780ca65a90117c2a61362dbc0899bd9c0b0 (diff)
Check for xf86CursorResetCursor
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. Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
-rw-r--r--configure.ac6
-rw-r--r--src/drmmode_display.c2
2 files changed, 8 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac
index f2bf57c6..eb97a6b8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -147,6 +147,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 3c873dc0..ad3de7f4 100644
--- a/src/drmmode_display.c
+++ b/src/drmmode_display.c
@@ -873,8 +873,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:
if (!ret) {