Merge branch 'dri2'

[mesa.git] / src / mesa / drivers / dri / i915 / intel_screen.c

diff --git a/src/mesa/drivers/dri/i915/intel_screen.c b/src/mesa/drivers/dri/i915/intel_screen.c
index df616f43b93020815f7c86d1467045fc94476775..291441b36080382d1dc1863acd240c37a3e9ca95 100644 (file)
--- a/src/mesa/drivers/dri/i915/intel_screen.c
+++ b/src/mesa/drivers/dri/i915/intel_screen.c
@@ -50,6 +50,8 @@
 #include "intel_regions.h"
 #include "intel_batchbuffer.h"
 
+#include "intel_bufmgr_ttm.h"
+
 PUBLIC const char __driConfigOptions[] =
    DRI_CONF_BEGIN DRI_CONF_SECTION_PERFORMANCE
    DRI_CONF_FTHROTTLE_MODE(DRI_CONF_FTHROTTLE_IRQS)
@@ -534,11 +536,13 @@ static GLboolean intelInitDriver(__DRIscreenPrivate *sPriv)
    intelScreen->ttm = GL_FALSE;
    if (getenv("INTEL_NO_TTM") == NULL &&
        intelScreen->driScrnPriv->ddx_version.minor >= 9 &&
+       intelScreen->drmMinor >= 11 &&
        intelScreen->front.bo_handle != -1) {
-      intelScreen->bufmgr = dri_bufmgr_ttm_init(sPriv->fd,
-                                               DRM_FENCE_TYPE_EXE,
-                                               DRM_FENCE_TYPE_EXE |
-                                               DRM_I915_FENCE_TYPE_RW);
+      intelScreen->bufmgr = intel_bufmgr_ttm_init(sPriv->fd,
+                                                 DRM_FENCE_TYPE_EXE,
+                                                 DRM_FENCE_TYPE_EXE |
+                                                 DRM_I915_FENCE_TYPE_RW,
+                                                 BATCH_SZ);
       if (intelScreen->bufmgr != NULL)
         intelScreen->ttm = GL_TRUE;
    }