Merge branch 'dri2'

Conflicts:

	src/mesa/drivers/dri/i915/intel_screen.c

diff --cc src/mesa/drivers/dri/i915/intel_screen.c
index 0934213c135bfa74da46954e4def347e3b8530c0,df616f43b93020815f7c86d1467045fc94476775..291441b36080382d1dc1863acd240c37a3e9ca95
--- 1/src/mesa/drivers/dri/i915/intel_screen.c
--- 2/src/mesa/drivers/dri/i915/intel_screen.c
+++ b/src/mesa/drivers/dri/i915/intel_screen.c
@@@ -538,14 -533,12 +535,14 @@@ static GLboolean intelInitDriver(__DRIs
      */
     intelScreen->ttm = GL_FALSE;
     if (getenv("INTEL_NO_TTM") == NULL &&
-        intelScreen->driScrnPriv->ddxMinor >= 9 &&
+        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;
     }