1 files changed, 6 insertions, 6 deletions

diff --git a/drivers/gpu/drm/i915/i915_gem_context.c b/drivers/gpu/drm/i915/i915_gem_context.c
index 5bf96a258509..e304dcbc6042 100644
--- a/drivers/gpu/drm/i915/i915_gem_context.c
+++ b/drivers/gpu/drm/i915/i915_gem_context.c
@@ -106,14 +106,9 @@ static void lut_close(struct i915_gem_context *ctx)
 
         radix_tree_for_each_slot(slot, &ctx->handles_vma, &iter, 0) {
                 struct i915_vma *vma = rcu_dereference_raw(*slot);
-                struct drm_i915_gem_object *obj = vma->obj;
 
                 radix_tree_iter_delete(&ctx->handles_vma, &iter, slot);
-
-                if (!i915_vma_is_ggtt(vma))
-                        i915_vma_close(vma);
-
-                __i915_gem_object_release_unless_active(obj);
+                __i915_gem_object_release_unless_active(vma->obj);
         }
 }
 
@@ -198,6 +193,11 @@ static void context_close(struct i915_gem_context *ctx)
 {
         i915_gem_context_set_closed(ctx);
 
+        /*
+         * The LUT uses the VMA as a backpointer to unref the object,
+         * so we need to clear the LUT before we close all the VMA (inside
+         * the ppgtt).
+         */
         lut_close(ctx);
         if (ctx->ppgtt)
                 i915_ppgtt_close(&ctx->ppgtt->base);