xf86-video-intel: src/compat-api.h src/sna/sna_display.c

[Chris Wilson]

 src/compat-api.h      |    6 ------
 src/sna/sna_display.c |   11 ++++++++++-
 2 files changed, 10 insertions(+), 7 deletions(-)

New commits:
commit b617f80ca5d386c1c248bab64276a9f283173a21
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Wed Jun 1 07:57:27 2016 +0100

    compat: Another day, another ABI change for OsBlockSGIO
    
    Now OsBlockSGIO/OsReleaseSGIO are back in the headers, but we include
    compat-api.h too early so we do not remove them. Instead, move the
    avoidance inline.
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/compat-api.h b/src/compat-api.h
index 371ece9..64e3736 100644
--- a/src/compat-api.h
+++ b/src/compat-api.h
@@ -30,7 +30,6 @@
 
 #include <xorg-server.h>
 #include <xorgVersion.h>
-#include <xf86Module.h>
 
 #include <picturestr.h>
 #ifndef GLYPH_HAS_GLYPH_PICTURE_ACCESSOR
@@ -251,9 +250,4 @@ static inline void FreePixmap(PixmapPtr pixmap)
 #define PixmapSyncDirtyHelper(d, dd) PixmapSyncDirtyHelper(d)
 #endif
 
-#if ABI_VIDEODRV_VERSION >= SET_ABI_VERSION(22, 0)
-#define OsBlockSIGIO()
-#define OsReleaseSIGIO()
-#endif
-
 #endif
diff --git a/src/sna/sna_display.c b/src/sna/sna_display.c
index 3a627a4..0cf2bdb 100644
--- a/src/sna/sna_display.c
+++ b/src/sna/sna_display.c
@@ -978,7 +978,16 @@ done:
 		   sna_output->backlight.iface, best_iface, output->name);
 }
 
-#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(1,12,99,901,0)
+#if ABI_VIDEODRV_VERSION >= SET_ABI_VERSION(22, 0)
+static inline int sigio_block(void)
+{
+	return 0;
+}
+static inline void sigio_unblock(int was_blocked)
+{
+	(void)was_blocked;
+}
+#elif XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(1,12,99,901,0)
 static inline int sigio_block(void)
 {
 	OsBlockSIGIO();