From 2a2068e7cf143bf3487769563ffb372dd4849e8d Mon Sep 17 00:00:00 2001 From: Andi Shyti Date: Mon, 13 May 2019 02:13:20 +0300 Subject: test/i915: i915_hangman: use the gem_engine_topology library Replace the legacy for_each_engine* defines with the ones implemented in the gem_engine_topology library. Signed-off-by: Andi Shyti Cc: Mika Kuoppala Cc: Chris Wilson Reviewed-by: Tvrtko Ursulin --- tests/i915/i915_hangman.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/tests/i915/i915_hangman.c b/tests/i915/i915_hangman.c index 9a1d5889..bb5521e0 100644 --- a/tests/i915/i915_hangman.c +++ b/tests/i915/i915_hangman.c @@ -256,7 +256,7 @@ static void hangcheck_unterminated(void) igt_main { - const struct intel_execution_engine *e; + const struct intel_execution_engine2 *e; igt_hang_t hang = {}; igt_skip_on_simulation(); @@ -276,16 +276,9 @@ igt_main igt_subtest("error-state-basic") test_error_state_basic(); - for (e = intel_execution_engines; e->name; e++) { - if (e->exec_id == 0) - continue; - - igt_subtest_f("error-state-capture-%s", e->name) { - igt_require(gem_ring_has_physical_engine(device, e->exec_id | e->flags)); - test_error_state_capture(e->exec_id | e->flags, - e->full_name); - } - } + __for_each_physical_engine(device, e) + igt_subtest_f("error-state-capture-%s", e->name) + test_error_state_capture(e->flags, e->name); igt_subtest("hangcheck-unterminated") hangcheck_unterminated(); -- cgit v1.2.3