drm/i915: Drop the deferred active reference

[linux.git] / drivers / gpu / drm / i915 / gem / selftests / i915_gem_context.c

diff --git a/drivers/gpu/drm/i915/gem/selftests/i915_gem_context.c b/drivers/gpu/drm/i915/gem/selftests/i915_gem_context.c
index 72eedd6c2a0a656bb0ed0de9454c716a701882de..1bc3b8026400d20fb08be3cce070b1df0efd6288 100644 (file)
--- a/drivers/gpu/drm/i915/gem/selftests/i915_gem_context.c
+++ b/drivers/gpu/drm/i915/gem/selftests/i915_gem_context.c
@@ -318,14 +318,14 @@ static int gpu_fill(struct drm_i915_gem_object *obj,
        if (err)
                goto skip_request;
 
-       i915_gem_object_set_active_reference(batch->obj);
+       i915_request_add(rq);
+
        i915_vma_unpin(batch);
        i915_vma_close(batch);
+       i915_vma_put(batch);
 
        i915_vma_unpin(vma);
 
-       i915_request_add(rq);
-
        return 0;
 
 skip_request:
@@ -802,9 +802,9 @@ emit_rpcs_query(struct drm_i915_gem_object *obj,
        if (err)
                goto skip_request;
 
-       i915_gem_object_set_active_reference(batch->obj);
        i915_vma_unpin(batch);
        i915_vma_close(batch);
+       i915_vma_put(batch);
 
        i915_vma_unpin(vma);
 
@@ -820,6 +820,7 @@ emit_rpcs_query(struct drm_i915_gem_object *obj,
        i915_request_add(rq);
 err_batch:
        i915_vma_unpin(batch);
+       i915_vma_put(batch);
 err_vma:
        i915_vma_unpin(vma);
 
@@ -1365,9 +1366,9 @@ static int write_to_scratch(struct i915_gem_context *ctx,
        if (err)
                goto skip_request;
 
-       i915_gem_object_set_active_reference(obj);
        i915_vma_unpin(vma);
        i915_vma_close(vma);
+       i915_vma_put(vma);
 
        i915_request_add(rq);