Merge branch 'i915-unification' of git+ssh://people.freedesktop.org/~anholt/mesa...

[mesa.git] / src / mesa / drivers / dri / common / dri_bufmgr_ttm.c

diff --git a/src/mesa/drivers/dri/common/dri_bufmgr_ttm.c b/src/mesa/drivers/dri/common/dri_bufmgr_ttm.c
index 508d4f5053972986019268958526f25cc84f7f06..fd432ba3f720a6334e913c7cca9430674094a4cd 100644 (file)
--- a/src/mesa/drivers/dri/common/dri_bufmgr_ttm.c
+++ b/src/mesa/drivers/dri/common/dri_bufmgr_ttm.c
@@ -150,7 +150,7 @@ dri_ttm_alloc_static(dri_bufmgr *bufmgr, const char *name,
     * pass all of the allocation class flags.
     */
    flags = location_mask | DRM_BO_FLAG_READ | DRM_BO_FLAG_WRITE |
-      DRM_BO_FLAG_EXE | DRM_BO_FLAG_NO_EVICT | DRM_BO_FLAG_NO_MOVE;
+      DRM_BO_FLAG_EXE | DRM_BO_FLAG_NO_MOVE;
    /* No hints we want to use. */
    hint = 0;
 
@@ -339,6 +339,15 @@ dri_ttm_fence_wait(dri_fence *fence)
    }
 }
 
+static void
+dri_fake_destroy(dri_bufmgr *bufmgr)
+{
+   dri_bufmgr_ttm *bufmgr_ttm = (dri_bufmgr_ttm *)bufmgr;
+
+   _glthread_DESTROY_MUTEX(bufmgr_ttm->mutex);
+   free(bufmgr);
+}
+
 /**
  * Initializes the TTM buffer manager, which uses the kernel to allocate, map,
  * and manage map buffer objections.