Commit 0c29efa2 authored by Tejas Upadhyay's avatar Tejas Upadhyay Committed by Andi Shyti

drm/i915/selftests: Consider multi-gt instead of to_gt()

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: default avatarTejas Upadhyay <tejas.upadhyay@intel.com>
Reviewed-by: default avatarAndi Shyti <andi.shyti@linux.intel.com>
Signed-off-by: default avatarAndi Shyti <andi.shyti@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230419060036.3422635-4-tejas.upadhyay@intel.com
parent a347279d
...@@ -16,27 +16,31 @@ int igt_live_test_begin(struct igt_live_test *t, ...@@ -16,27 +16,31 @@ int igt_live_test_begin(struct igt_live_test *t,
const char *func, const char *func,
const char *name) const char *name)
{ {
struct intel_gt *gt = to_gt(i915);
struct intel_engine_cs *engine; struct intel_engine_cs *engine;
enum intel_engine_id id; enum intel_engine_id id;
struct intel_gt *gt;
unsigned int i;
int err; int err;
t->i915 = i915; t->i915 = i915;
t->func = func; t->func = func;
t->name = name; t->name = name;
err = intel_gt_wait_for_idle(gt, MAX_SCHEDULE_TIMEOUT); for_each_gt(gt, i915, i) {
if (err) {
pr_err("%s(%s): failed to idle before, with err=%d!",
func, name, err);
return err;
}
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) for_each_engine(engine, gt, id)
t->reset_engine[id] = t->reset_engine[id] =
i915_reset_engine_count(&i915->gpu_error, engine); i915_reset_engine_count(&i915->gpu_error, engine);
}
t->reset_global = i915_reset_count(&i915->gpu_error);
return 0; return 0;
} }
...@@ -46,6 +50,8 @@ int igt_live_test_end(struct igt_live_test *t) ...@@ -46,6 +50,8 @@ int igt_live_test_end(struct igt_live_test *t)
struct drm_i915_private *i915 = t->i915; struct drm_i915_private *i915 = t->i915;
struct intel_engine_cs *engine; struct intel_engine_cs *engine;
enum intel_engine_id id; enum intel_engine_id id;
struct intel_gt *gt;
unsigned int i;
if (igt_flush_test(i915)) if (igt_flush_test(i915))
return -EIO; return -EIO;
...@@ -57,16 +63,18 @@ int igt_live_test_end(struct igt_live_test *t) ...@@ -57,16 +63,18 @@ int igt_live_test_end(struct igt_live_test *t)
return -EIO; return -EIO;
} }
for_each_engine(engine, to_gt(i915), id) { for_each_gt(gt, i915, i) {
if (t->reset_engine[id] == for_each_engine(engine, gt, id) {
i915_reset_engine_count(&i915->gpu_error, engine)) if (t->reset_engine[id] ==
continue; i915_reset_engine_count(&i915->gpu_error, engine))
continue;
pr_err("%s(%s): engine '%s' was reset %d times!\n", pr_err("%s(%s): engine '%s' was reset %d times!\n",
t->func, t->name, engine->name, t->func, t->name, engine->name,
i915_reset_engine_count(&i915->gpu_error, engine) - i915_reset_engine_count(&i915->gpu_error, engine) -
t->reset_engine[id]); t->reset_engine[id]);
return -EIO; return -EIO;
}
} }
return 0; return 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment