[PATCH xserver] mi: Remove spurious call to OsReleaseSignals from mieqGrowQueue

Keith Packard keithp at keithp.com
Fri Aug 12 04:35:35 UTC 2016

This call wasn't converted to 'input_unlock()' when the SIGIO code was
removed from the server, and so when the queue growing was reworked to
be done from the input thread, it got left sitting here. As the caller
now manages the lock, we don't need to switch this to input_unlock at
this point.

Signed-off-by: Keith Packard <keithp at keithp.com>
 configure.ac | 17 +++++++++++++++--
 mi/mieq.c    |  1 -
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index 690035a..e206e0f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -654,7 +654,7 @@ AC_ARG_ENABLE(xquartz,        AS_HELP_STRING([--enable-xquartz], [Build Xquartz
 AC_ARG_ENABLE(xwayland,       AS_HELP_STRING([--enable-xwayland], [Build Xwayland server (default: auto)]), [XWAYLAND=$enableval], [XWAYLAND=auto])
 AC_ARG_ENABLE(standalone-xpbproxy, AS_HELP_STRING([--enable-standalone-xpbproxy], [Build a standalone xpbproxy (in addition to the one integrated into Xquartz as a separate thread) (default: no)]), [STANDALONE_XPBPROXY=$enableval], [STANDALONE_XPBPROXY=no])
 AC_ARG_ENABLE(xwin,    	      AS_HELP_STRING([--enable-xwin], [Build XWin server (default: auto)]), [XWIN=$enableval], [XWIN=auto])
-AC_ARG_ENABLE(glamor,         AS_HELP_STRING([--enable-glamor], [Build glamor dix module (default: yes)]), [GLAMOR=$enableval], [GLAMOR=yes])
+AC_ARG_ENABLE(glamor,         AS_HELP_STRING([--enable-glamor], [Build glamor dix module (default: auto)]), [GLAMOR=$enableval], [GLAMOR=auto])
 dnl kdrive and its subsystems
 AC_ARG_ENABLE(kdrive,         AS_HELP_STRING([--enable-kdrive], [Build kdrive servers (default: no)]), [KDRIVE=$enableval], [KDRIVE=no])
 AC_ARG_ENABLE(xephyr,         AS_HELP_STRING([--enable-xephyr], [Build the kdrive Xephyr server (default: auto)]), [XEPHYR=$enableval], [XEPHYR=auto])
@@ -2150,7 +2150,17 @@ AM_CONDITIONAL([XORG_BUS_PLATFORM], [test "x$CONFIG_UDEV_KMS" = xyes])
 dnl glamor
+if test "x$GLAMOR" = xauto; then
+	if test "x$XORG" = xyes; then
+		GLAMOR=yes
+	fi
+	if test "x$XEPHYR" = xyes; then
+		GLAMOR=yes
+	fi
 AM_CONDITIONAL([GLAMOR], [test "x$GLAMOR" = xyes])
 if test "x$GLAMOR" = xyes; then
 	AC_DEFINE(GLAMOR, 1, [Build glamor])
@@ -2163,8 +2173,11 @@ if test "x$GLAMOR" = xyes; then
 			[#include <stdlib.h>
 			 #include <gbm.h>])
+	else
+		if test "x$XORG" = xyes; then
+			AC_MSG_ERROR([Glamor for Xorg requires $LIBGBM])
+		fi
 AM_CONDITIONAL([GLAMOR_EGL], [test "x$GBM" = xyes])
diff --git a/mi/mieq.c b/mi/mieq.c
index 05447d6..e31e4f1 100644
--- a/mi/mieq.c
+++ b/mi/mieq.c
@@ -160,7 +160,6 @@ mieqGrowQueue(EventQueuePtr eventQueue, size_t new_nevents)
             for (j = 0; j < i; j++)
                 FreeEventList(new_events[j].events, 1);
-            OsReleaseSignals();
             return FALSE;
         new_events[i].events = evlist;

More information about the xorg-devel mailing list