Commit d1a03ee7 authored by Tvrtko Ursulin's avatar Tvrtko Ursulin Committed by Chris Wilson

drm/i915/selftests: Use GT engines in igt_live_test

Frees up two call sites from passing i915 to for_each_engine.
Signed-off-by: default avatarTvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20191022094726.3001-11-tvrtko.ursulin@linux.intel.com
parent 6457099a
...@@ -16,6 +16,7 @@ int igt_live_test_begin(struct igt_live_test *t, ...@@ -16,6 +16,7 @@ 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 = &i915->gt;
struct intel_engine_cs *engine; struct intel_engine_cs *engine;
enum intel_engine_id id; enum intel_engine_id id;
int err; int err;
...@@ -24,7 +25,7 @@ int igt_live_test_begin(struct igt_live_test *t, ...@@ -24,7 +25,7 @@ int igt_live_test_begin(struct igt_live_test *t,
t->func = func; t->func = func;
t->name = name; t->name = name;
err = intel_gt_wait_for_idle(&i915->gt, MAX_SCHEDULE_TIMEOUT); err = intel_gt_wait_for_idle(gt, MAX_SCHEDULE_TIMEOUT);
if (err) { if (err) {
pr_err("%s(%s): failed to idle before, with err=%d!", pr_err("%s(%s): failed to idle before, with err=%d!",
func, name, err); func, name, err);
...@@ -33,7 +34,7 @@ int igt_live_test_begin(struct igt_live_test *t, ...@@ -33,7 +34,7 @@ int igt_live_test_begin(struct igt_live_test *t,
t->reset_global = i915_reset_count(&i915->gpu_error); t->reset_global = i915_reset_count(&i915->gpu_error);
for_each_engine(engine, i915, 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);
...@@ -56,7 +57,7 @@ int igt_live_test_end(struct igt_live_test *t) ...@@ -56,7 +57,7 @@ int igt_live_test_end(struct igt_live_test *t)
return -EIO; return -EIO;
} }
for_each_engine(engine, i915, id) { for_each_engine(engine, &i915->gt, id) {
if (t->reset_engine[id] == if (t->reset_engine[id] ==
i915_reset_engine_count(&i915->gpu_error, engine)) i915_reset_engine_count(&i915->gpu_error, engine))
continue; continue;
......
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