drm/i915: Use for_each_child instead of manual for-loop

Commit Message

Nirmoy Das May 14, 2024, 10:50 a.m. UTC

Simplify child iteration using for_each_child macro
instead of using manual for loop. There is no functional
change.

Cc: John Harrison <[e-mail]>
Cc: Tvrtko Ursulin <[e-mail]>
Signed-off-by: Nirmoy Das <[e-mail]>
---
 .../gpu/drm/i915/gt/uc/intel_guc_submission.c | 64 ++++++++++---------
 1 file changed, 33 insertions(+), 31 deletions(-)

Patch

diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c b/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c
index 0eaa1064242c..7e88d90e935b 100644
--- a/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c
+++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c
@@ -1800,14 +1800,37 @@  __unwind_incomplete_requests(struct intel_context *ce)
 	spin_unlock_irqrestore(&sched_engine->lock, flags);
 }
 
-static void __guc_reset_context(struct intel_context *ce, intel_engine_mask_t stalled)
+static void guc_reset_context_state(struct intel_context *ce, intel_engine_mask_t stalled)
 {
-	bool guilty;
 	struct i915_request *rq;
-	unsigned long flags;
+	bool guilty = false;
 	u32 head;
-	int i, number_children = ce->parallel.number_children;
-	struct intel_context *parent = ce;
+
+	if (!intel_context_is_pinned(ce))
+		return;
+
+	rq = intel_context_get_active_request(ce);
+	if (!rq) {
+		head = ce->ring->tail;
+		goto out_replay;
+	}
+
+	if (i915_request_started(rq))
+		guilty = stalled & ce->engine->mask;
+
+	GEM_BUG_ON(i915_active_is_idle(&ce->active));
+	head = intel_ring_wrap(ce->ring, rq->head);
+
+	__i915_request_reset(rq, guilty);
+	i915_request_put(rq);
+out_replay:
+	guc_reset_state(ce, head, guilty);
+}
+
+static void __guc_reset_context(struct intel_context *ce, intel_engine_mask_t stalled)
+{
+	struct intel_context *child;
+	unsigned long flags;
 
 	GEM_BUG_ON(intel_context_is_child(ce));
 
@@ -1826,34 +1849,13 @@  static void __guc_reset_context(struct intel_context *ce, intel_engine_mask_t st
 	 * For each context in the relationship find the hanging request
 	 * resetting each context / request as needed
 	 */
-	for (i = 0; i < number_children + 1; ++i) {
-		if (!intel_context_is_pinned(ce))
-			goto next_context;
-
-		guilty = false;
-		rq = intel_context_get_active_request(ce);
-		if (!rq) {
-			head = ce->ring->tail;
-			goto out_replay;
-		}
-
-		if (i915_request_started(rq))
-			guilty = stalled & ce->engine->mask;
-
-		GEM_BUG_ON(i915_active_is_idle(&ce->active));
-		head = intel_ring_wrap(ce->ring, rq->head);
-
-		__i915_request_reset(rq, guilty);
-		i915_request_put(rq);
-out_replay:
-		guc_reset_state(ce, head, guilty);
-next_context:
-		if (i != number_children)
-			ce = list_next_entry(ce, parallel.child_link);
+	guc_reset_context_state(ce, stalled);
+	for_each_child(ce, child) {
+		guc_reset_context_state(child, stalled);
 	}
 
-	__unwind_incomplete_requests(parent);
-	intel_context_put(parent);
+	__unwind_incomplete_requests(ce);
+	intel_context_put(ce);
 }
 
 void wake_up_all_tlb_invalidate(struct intel_guc *guc)