[PATCH 7/8] own-evict

[Chris Wilson]

---
 drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c | 2 --
 drivers/gpu/drm/i915/i915_vma.c                | 2 --
 2 files changed, 4 deletions(-)

diff --git a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
index f164faa8a760..3104853d69ad 100644
--- a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
@@ -1048,14 +1048,12 @@ static int __eb_bind_vma(struct eb_vm_work *work, int err)
 	if (!list_empty(&work->eviction_list)) {
 		struct i915_vma *vma, *vn;
 
-		mutex_lock(&vm->mutex);
 		list_for_each_entry_safe(vma, vn,
 					 &work->eviction_list, vm_link) {
 			GEM_BUG_ON(vma->vm != vm);
 			GEM_BUG_ON(!i915_vma_is_active(vma));
 			__i915_vma_evict(vma);
 		}
-		mutex_unlock(&vm->mutex);
 	}
 
 	/*
diff --git a/drivers/gpu/drm/i915/i915_vma.c b/drivers/gpu/drm/i915/i915_vma.c
index 9b79e64c798a..b57462b18488 100644
--- a/drivers/gpu/drm/i915/i915_vma.c
+++ b/drivers/gpu/drm/i915/i915_vma.c
@@ -858,8 +858,6 @@ static void vma_unbind_pages(struct i915_vma *vma)
 {
 	unsigned int count;
 
-	lockdep_assert_held(&vma->vm->mutex);
-
 	/* The upper portion of pages_count is the number of bindings */
 	count = atomic_read(&vma->pages_count);
 	count >>= I915_VMA_PAGES_BIAS;
-- 
2.20.1