[PATCH 3/3] hmm

[Chris Wilson]

---
 drivers/gpu/drm/i915/gt/intel_engine_pm.c | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/drivers/gpu/drm/i915/gt/intel_engine_pm.c b/drivers/gpu/drm/i915/gt/intel_engine_pm.c
index 0e1ad4a4bd97..6aa162d0c76b 100644
--- a/drivers/gpu/drm/i915/gt/intel_engine_pm.c
+++ b/drivers/gpu/drm/i915/gt/intel_engine_pm.c
@@ -93,16 +93,15 @@ __queue_and_release_pm(struct i915_request *rq,
 	 */
 	spin_lock(&timelines->lock);
 
-	/* Let intel_gt_retire_requests() retire us (acquired under lock) */
-	if (!atomic_fetch_inc(&tl->active_count))
-		list_add_tail(&tl->link, &timelines->active_list);
+	/* Let new submissions commence (and maybe retire this timeline) */
+	__intel_wakeref_defer_park(&engine->wakeref);
 
 	/* Hand the request over to HW and so engine_retire() */
 	__i915_request_queue(rq, NULL);
 
-	/* Let new submissions commence (and maybe retire this timeline) */
-	__intel_wakeref_defer_park(&engine->wakeref);
-
+	/* Let intel_gt_retire_requests() retire us (acquired under lock) */
+	if (!atomic_fetch_inc(&tl->active_count))
+		list_add_tail(&tl->link, &timelines->active_list);
 	spin_unlock(&timelines->lock);
 }
 
-- 
2.24.0