summaryrefslogtreecommitdiff
path: root/driver
diff options
context:
space:
mode:
authorJonathan Gray <jsg@cvs.openbsd.org>2016-09-05 11:20:19 +0000
committerJonathan Gray <jsg@cvs.openbsd.org>2016-09-05 11:20:19 +0000
commit7cae3cc4fa3124fbbb32d76500aeaef3f447d8f4 (patch)
tree7499c08510e11717d25645980ddd0b876904ce3c /driver
parenta745570cf57dc4267273fe6e97e27b150e575215 (diff)
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.
Diffstat (limited to 'driver')
-rw-r--r--driver/xf86-video-intel/src/uxa/intel.h2
-rw-r--r--driver/xf86-video-intel/src/uxa/intel_driver.c2
2 files changed, 1 insertions, 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);