[Intel-gfx] [PATCH 3/3] drm/i915/selftests: Consider multi-gt instead of to_gt()

[Tejas Upadhyay]

In order to enable complete multi-GT, loop through all
the GTs, rather than relying on the to_gt(), which only
provides a reference to the primary GT.

Problem appear when it runs on platform like MTL where
different set of engines are possible on different GTs.

Signed-off-by: Tejas Upadhyay <tejas.upadh...@intel.com>
---
 .../gpu/drm/i915/selftests/igt_live_test.c    | 46 +++++++++++--------
 1 file changed, 27 insertions(+), 19 deletions(-)

diff --git a/drivers/gpu/drm/i915/selftests/igt_live_test.c 
b/drivers/gpu/drm/i915/selftests/igt_live_test.c
index 72b58b66692a..714b7afc490b 100644
--- a/drivers/gpu/drm/i915/selftests/igt_live_test.c
+++ b/drivers/gpu/drm/i915/selftests/igt_live_test.c
@@ -16,27 +16,31 @@ int igt_live_test_begin(struct igt_live_test *t,
                        const char *func,
                        const char *name)
 {
-       struct intel_gt *gt = to_gt(i915);
        struct intel_engine_cs *engine;
        enum intel_engine_id id;
+       struct intel_gt *gt;
+       unsigned int i;
        int err;
 
        t->i915 = i915;
        t->func = func;
        t->name = name;
 
-       err = intel_gt_wait_for_idle(gt, MAX_SCHEDULE_TIMEOUT);
-       if (err) {
-               pr_err("%s(%s): failed to idle before, with err=%d!",
-                      func, name, err);
-               return err;
-       }
+       for_each_gt(gt, i915, i) {
 
-       t->reset_global = i915_reset_count(&i915->gpu_error);
+               err = intel_gt_wait_for_idle(gt, MAX_SCHEDULE_TIMEOUT);
+               if (err) {
+                       pr_err("%s(%s): failed to idle before, with err=%d!",
+                              func, name, err);
+                       return err;
+               }
 
-       for_each_engine(engine, gt, id)
-               t->reset_engine[id] =
+               for_each_engine(engine, gt, id)
+                       t->reset_engine[id] =
                        i915_reset_engine_count(&i915->gpu_error, engine);
+       }
+
+       t->reset_global = i915_reset_count(&i915->gpu_error);
 
        return 0;
 }
@@ -46,6 +50,8 @@ int igt_live_test_end(struct igt_live_test *t)
        struct drm_i915_private *i915 = t->i915;
        struct intel_engine_cs *engine;
        enum intel_engine_id id;
+       struct intel_gt *gt;
+       unsigned int i;
 
        if (igt_flush_test(i915))
                return -EIO;
@@ -57,16 +63,18 @@ int igt_live_test_end(struct igt_live_test *t)
                return -EIO;
        }
 
-       for_each_engine(engine, to_gt(i915), id) {
-               if (t->reset_engine[id] ==
-                   i915_reset_engine_count(&i915->gpu_error, engine))
-                       continue;
+       for_each_gt(gt, i915, i) {
+               for_each_engine(engine, gt, id) {
+                       if (t->reset_engine[id] ==
+                           i915_reset_engine_count(&i915->gpu_error, engine))
+                               continue;
 
-               pr_err("%s(%s): engine '%s' was reset %d times!\n",
-                      t->func, t->name, engine->name,
-                      i915_reset_engine_count(&i915->gpu_error, engine) -
-                      t->reset_engine[id]);
-               return -EIO;
+                       pr_err("%s(%s): engine '%s' was reset %d times!\n",
+                              t->func, t->name, engine->name,
+                              i915_reset_engine_count(&i915->gpu_error, 
engine) -
+                              t->reset_engine[id]);
+                       return -EIO;
+               }
        }
 
        return 0;
-- 
2.25.1