Remove XF86DRM_MODE.

We now depend on server 1.6 and current libdrm, so no need to ifdef it.

5 files changed, 2 insertions, 30 deletions

diff --git a/configure.ac b/configure.ac
index 18fe98308..14a1c6b34 100644
--- a/configure.ac
+++ b/configure.ac
@@ -163,13 +163,6 @@ if test "$DRI" = yes; then
         AC_DEFINE(XF86DRI_DEVEL,1,[Enable developmental DRI driver support])
 fi
 
-dnl Server 1.5's set_mode_major required for DRM_MODE.
-PKG_CHECK_MODULES(DRM_MODE, [xorg-server >= 1.5],
-		 [DRM_MODE=yes], [DRM_MODE=no])
-if test "x$DRM_MODE" = xyes; then
-	AC_DEFINE(XF86DRM_MODE,1,[DRM kernel modesetting])
-fi
-
 AM_CONDITIONAL(VIDEO_DEBUG, test x$VIDEO_DEBUG = xyes)
 if test "$VIDEO_DEBUG" = yes; then
 	AC_DEFINE(VIDEO_DEBUG,1,[Enable debug support])
diff --git a/src/drmmode_display.c b/src/drmmode_display.c
index 298c471fe..15ffc29c2 100644
--- a/src/drmmode_display.c
+++ b/src/drmmode_display.c
@@ -31,7 +31,6 @@
 
 #include "xorgVersion.h"
 
-#ifdef XF86DRM_MODE
 #include "i830.h"
 #include "intel_bufmgr.h"
 #include "xf86drmMode.h"
@@ -921,5 +920,3 @@ Bool drmmode_pre_init(ScrnInfoPtr pScrn, int fd, int cpp)
 
 	return TRUE;
 }
-
-#endif
diff --git a/src/i830.h b/src/i830.h
index 8d51f2cb1..a573c2dde 100644
--- a/src/i830.h
+++ b/src/i830.h
@@ -685,9 +685,7 @@ i830_pipe_a_require_deactivate (ScrnInfoPtr scrn);
 Bool I830DRI2ScreenInit(ScreenPtr pScreen);
 void I830DRI2CloseScreen(ScreenPtr pScreen);
 
-#ifdef XF86DRM_MODE
 extern Bool drmmode_pre_init(ScrnInfoPtr pScrn, int fd, int cpp);
-#endif
 
 extern Bool I830AccelInit(ScreenPtr pScreen);
 extern void I830SetupForScreenToScreenCopy(ScrnInfoPtr pScrn, int xdir,
diff --git a/src/i830_dri.c b/src/i830_dri.c
index 745162d13..743521cd0 100644
--- a/src/i830_dri.c
+++ b/src/i830_dri.c
@@ -387,15 +387,10 @@ Bool I830DRI2ScreenInit(ScreenPtr pScreen)
 	    pI830->PciInfo->dev,
 	    pI830->PciInfo->func);
 
-    info.fd = -1;
-
-#ifdef XF86DRM_MODE
     /* Use the already opened (master) fd from modesetting */
-    if (pI830->use_drm_mode)
+    if (pI830->use_drm_mode) {
 	info.fd = pI830->drmSubFD;
-#endif
-
-    if (info.fd < 0) {
+    } else {
 	info.fd = drmOpen("i915", buf);
 	drmSetVersion sv;
 	int err;
diff --git a/src/i830_driver.c b/src/i830_driver.c
index b4111d31a..5a8c5d9e0 100644
--- a/src/i830_driver.c
+++ b/src/i830_driver.c
@@ -208,10 +208,7 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include <sys/ioctl.h>
 #include "i915_drm.h"
-
-#ifdef XF86DRM_MODE
 #include <xf86drmMode.h>
-#endif
 
 #define BIT(x) (1 << (x))
 #define MAX(a,b) ((a) > (b) ? (a) : (b))
@@ -1176,7 +1173,6 @@ i830SetHotkeyControl(ScrnInfoPtr pScrn, int mode)
    pI830->writeControl(pI830, GRX, 0x18, gr18);
 }
 
-#ifdef XF86DRM_MODE
 /*
  * DRM mode setting Linux only at this point... later on we could
  * add a wrapper here.
@@ -1207,9 +1203,6 @@ static Bool i830_kernel_mode_enabled(ScrnInfoPtr pScrn)
 
     return TRUE;
 }
-#else
-#define i830_kernel_mode_enabled(x) FALSE
-#endif
 
 static Bool
 i830_detect_chipset(ScrnInfoPtr pScrn)
@@ -1620,7 +1613,6 @@ I830AccelMethodInit(ScrnInfoPtr pScrn)
 static Bool
 I830DrmModeInit(ScrnInfoPtr pScrn)
 {
-#ifdef XF86DRM_MODE
     I830Ptr pI830 = I830PTR(pScrn);
     char *bus_id;
     int ret;
@@ -1651,7 +1643,6 @@ I830DrmModeInit(ScrnInfoPtr pScrn)
     pI830->directRenderingType = DRI_NONE;
 
     i830_init_bufmgr(pScrn);
-#endif
 
     return TRUE;
 }
@@ -2767,10 +2758,8 @@ I830ScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
    }
 
    if (pI830->use_drm_mode) {
-#ifdef XF86DRM_MODE
        pI830->stolen_size = 0;
        pScrn->videoRam = ~0UL / KB(1);
-#endif
    } else {
        I830AdjustMemory(pScreen);
    }