[PATCH 09/11] tweak2

[Chris Wilson]

---
 drivers/gpu/drm/i915/gem/i915_gem_mman.c | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/drivers/gpu/drm/i915/gem/i915_gem_mman.c b/drivers/gpu/drm/i915/gem/i915_gem_mman.c
index 5a17256c55eb..4a546d5ab96b 100644
--- a/drivers/gpu/drm/i915/gem/i915_gem_mman.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_mman.c
@@ -413,15 +413,10 @@ void __i915_gem_object_release_mmap_gtt(struct drm_i915_gem_object *obj)
 
 	GEM_BUG_ON(!obj->userfault_count);
 
-	obj->userfault_count = 0;
-	list_del(&obj->userfault_link);
+	for_each_ggtt_vma(vma, obj)
+		i915_vma_revoke_mmap(vma);
 
-	for_each_ggtt_vma(vma, obj) {
-		if (vma->mmo)
-			drm_vma_node_unmap(&vma->mmo->vma_node,
-					   obj->base.dev->anon_inode->i_mapping);
-		i915_vma_unset_userfault(vma);
-	}
+	GEM_BUG_ON(obj->userfault_count);
 }
 
 /**
-- 
2.24.0