[PATCH 4/5] drm/i915: Do not (un)pin contexts in i915_requests

Maarten Lankhorst maarten.lankhorst at linux.intel.com
Tue Jun 29 14:33:51 UTC 2021


Should have been handled by the i915_active embedded in there.

Signed-off-by: Maarten Lankhorst <maarten.lankhorst at linux.intel.com>
---
 drivers/gpu/drm/i915/i915_request.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_request.c b/drivers/gpu/drm/i915/i915_request.c
index c5989c0b83d3..5f5a3ba7e8d8 100644
--- a/drivers/gpu/drm/i915/i915_request.c
+++ b/drivers/gpu/drm/i915/i915_request.c
@@ -424,7 +424,7 @@ bool i915_request_retire(struct i915_request *rq)
 	__list_del_entry(&rq->link); /* poison neither prev/next (RCU walks) */
 
 	intel_context_exit(rq->context);
-	intel_context_unpin(rq->context);
+	i915_active_release(&rq->context->active);
 
 	free_capture_list(rq);
 	i915_sched_node_fini(&rq->sched);
@@ -932,7 +932,7 @@ __i915_request_create(struct intel_context *ce, gfp_t gfp)
 	might_alloc(gfp);
 
 	/* Check that the caller provided an already pinned context */
-	__intel_context_pin(ce);
+	__i915_active_acquire(&ce->active);
 
 	/*
 	 * Beware: Dragons be flying overhead.
@@ -1052,7 +1052,7 @@ __i915_request_create(struct intel_context *ce, gfp_t gfp)
 err_free:
 	kmem_cache_free(global.slab_requests, rq);
 err_unreserve:
-	intel_context_unpin(ce);
+	i915_active_release(&ce->active);
 	return ERR_PTR(ret);
 }
 
-- 
2.31.0



More information about the Intel-gfx-trybot mailing list