diff options
Diffstat (limited to 'drivers/gpu/drm/i915/i915_request.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_request.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/gpu/drm/i915/i915_request.c b/drivers/gpu/drm/i915/i915_request.c index 9b2b18f0196b..43175bada09e 100644 --- a/drivers/gpu/drm/i915/i915_request.c +++ b/drivers/gpu/drm/i915/i915_request.c @@ -306,12 +306,12 @@ static bool i915_request_retire(struct i915_request *rq) local_irq_enable(); - intel_context_exit(rq->hw_context); - intel_context_unpin(rq->hw_context); - i915_request_remove_from_client(rq); list_del(&rq->link); + intel_context_exit(rq->hw_context); + intel_context_unpin(rq->hw_context); + free_capture_list(rq); i915_sched_node_fini(&rq->sched); i915_request_put(rq); @@ -608,7 +608,7 @@ out: struct i915_request * __i915_request_create(struct intel_context *ce, gfp_t gfp) { - struct intel_timeline *tl = ce->ring->timeline; + struct intel_timeline *tl = ce->timeline; struct i915_request *rq; u32 seqno; int ret; @@ -760,7 +760,7 @@ i915_request_create(struct intel_context *ce) goto err_unlock; /* Check that we do not interrupt ourselves with a new request */ - rq->cookie = lockdep_pin_lock(&ce->ring->timeline->mutex); + rq->cookie = lockdep_pin_lock(&ce->timeline->mutex); return rq; |