From: Kristian Høgsberg <krh@redhat.com>
Date: Fri, 12 Oct 2007 23:35:04 +0000 (-0400)
Subject: Merge branch 'dri2'
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=f9c6dfc4d12451c21f39f38b048758cbee5723cf;p=mesa.git

Merge branch 'dri2'

Conflicts:

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

f9c6dfc4d12451c21f39f38b048758cbee5723cf
diff --cc src/mesa/drivers/dri/i915/intel_screen.c
index 0934213c135,df616f43b93..291441b3608
--- a/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;
     }