summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichel Dänzer <michel.daenzer@amd.com>2016-03-24 18:51:59 +0900
committerMichel Dänzer <michel@daenzer.net>2016-03-25 10:37:44 +0900
commit3177fe817a5f2de4ed10860866a0dd6d6c6ba816 (patch)
treeeb1654234cbe571ddb51fa942b50bf603fa4367e
parenta3dfce7b24e1ea01c1aa62926025a545312cbe13 (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. (Ported from radeon commit d670c5c9851b4eff21c845d26c7d7e4eb5ee0fa9) 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 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);