[PATCH 3/3] hmm

[Chris Wilson]

---
 drivers/gpu/drm/i915/gt/intel_engine_pm.c | 3 ++-
 drivers/gpu/drm/i915/gt/intel_timeline.c  | 3 ++-
 2 files changed, 4 insertions(+), 2 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..27637e4065ba 100644
--- a/drivers/gpu/drm/i915/gt/intel_engine_pm.c
+++ b/drivers/gpu/drm/i915/gt/intel_engine_pm.c
@@ -94,8 +94,9 @@ __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))
+	if (!atomic_read(&tl->active_count))
 		list_add_tail(&tl->link, &timelines->active_list);
+	atomic_inc(&tl->active_count);
 
 	/* Hand the request over to HW and so engine_retire() */
 	__i915_request_queue(rq, NULL);
diff --git a/drivers/gpu/drm/i915/gt/intel_timeline.c b/drivers/gpu/drm/i915/gt/intel_timeline.c
index c1d2419444f8..0e91480f784c 100644
--- a/drivers/gpu/drm/i915/gt/intel_timeline.c
+++ b/drivers/gpu/drm/i915/gt/intel_timeline.c
@@ -359,8 +359,9 @@ void intel_timeline_enter(struct intel_timeline *tl)
 		return;
 
 	spin_lock(&timelines->lock);
-	if (!atomic_fetch_inc(&tl->active_count))
+	if (!atomic_read(&tl->active_count))
 		list_add_tail(&tl->link, &timelines->active_list);
+	atomic_inc(&tl->active_count);
 	spin_unlock(&timelines->lock);
 }
 
-- 
2.24.0