[PATCH 1/3] hmm

[Chris Wilson]

From: Chris Wilson <ickle at braswell.alporthouse.com>

---
 drivers/gpu/drm/i915/i915_request.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_request.c b/drivers/gpu/drm/i915/i915_request.c
index a558f64186fa..d25aa31a8ad1 100644
--- a/drivers/gpu/drm/i915/i915_request.c
+++ b/drivers/gpu/drm/i915/i915_request.c
@@ -231,6 +231,8 @@ bool i915_request_retire(struct i915_request *rq)
 	GEM_BUG_ON(!i915_sw_fence_signaled(&rq->submit));
 	trace_i915_request_retire(rq);
 
+	i915_sched_node_fini(&rq->sched);
+
 	/*
 	 * We know the GPU must have read the request to have
 	 * sent us the seqno + interrupt, so use the position
@@ -269,14 +271,13 @@ bool i915_request_retire(struct i915_request *rq)
 	GEM_BUG_ON(!list_empty(&rq->execute_cb));
 	spin_unlock_irq(&rq->lock);
 
-	remove_from_client(rq);
-	list_del(&rq->link);
-
 	intel_context_exit(rq->hw_context);
 	intel_context_unpin(rq->hw_context);
 
+	remove_from_client(rq);
+	list_del(&rq->link);
+
 	free_capture_list(rq);
-	i915_sched_node_fini(&rq->sched);
 	i915_request_put(rq);
 
 	return true;
-- 
2.24.0