From 7f4dc931087074ce64364fc6db5f4ad01c34c241 Mon Sep 17 00:00:00 2001
From: jsg <jsg@openbsd.org>
Date: Mon, 5 Sep 2016 11:20:18 +0000
Subject: [PATCH] Define an empty inline intel_sync_close() in a header for
 dri2 to match newer intel code instead of putting an ifdef around the call.

---
 driver/xf86-video-intel/src/uxa/intel.h        | 2 +-
 driver/xf86-video-intel/src/uxa/intel_driver.c | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/driver/xf86-video-intel/src/uxa/intel.h b/driver/xf86-video-intel/src/uxa/intel.h
index eebe08fa7..0191ea900 100644
--- a/driver/xf86-video-intel/src/uxa/intel.h
+++ b/driver/xf86-video-intel/src/uxa/intel.h
@@ -743,7 +743,7 @@ Bool intel_sync_init(ScreenPtr screen);
 void intel_sync_close(ScreenPtr screen);
 #else
 static inline Bool intel_sync_init(ScreenPtr screen) { return 0; }
-void intel_sync_close(ScreenPtr screen);
+static inline void intel_sync_close(ScreenPtr screen) { }
 #endif
 
 /*
diff --git a/driver/xf86-video-intel/src/uxa/intel_driver.c b/driver/xf86-video-intel/src/uxa/intel_driver.c
index 45ebbc9eb..7877eb5a6 100644
--- a/driver/xf86-video-intel/src/uxa/intel_driver.c
+++ b/driver/xf86-video-intel/src/uxa/intel_driver.c
@@ -1188,9 +1188,7 @@ static Bool I830CloseScreen(CLOSE_SCREEN_ARGS_DECL)
 		intel->dri3 = DRI_NONE;
 	}
 
-#if HAVE_DRI3
 	intel_sync_close(screen);
-#endif
 
 	xf86GARTCloseScreen(scrn->scrnIndex);