diff options
author | Andi Shyti <andi.shyti@intel.com> | 2019-05-13 02:13:05 +0300 |
---|---|---|
committer | Andi Shyti <andi.shyti@intel.com> | 2019-05-15 15:01:57 +0300 |
commit | 6aec923882b52e9f4de17cde38dbe3e4d5bb2ec9 (patch) | |
tree | 0f198fa4119555a27bf834abdd586cefb0967470 | |
parent | 29cb9f0b9e6125fddd5d9fb47ccc7233963202f2 (diff) |
test/i915: gem_wait: 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 <andi.shyti@intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
-rw-r--r-- | tests/i915/gem_wait.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/tests/i915/gem_wait.c b/tests/i915/gem_wait.c index ee2ecfa0..b5e32219 100644 --- a/tests/i915/gem_wait.c +++ b/tests/i915/gem_wait.c @@ -134,7 +134,7 @@ static void basic(int fd, unsigned engine, unsigned flags) igt_main { - const struct intel_execution_engine *e; + const struct intel_execution_engine2 *e; int fd = -1; igt_skip_on_simulation(); @@ -177,27 +177,27 @@ igt_main basic(fd, ALL_ENGINES, WRITE); } - for (e = intel_execution_engines; e->name; e++) { + __for_each_physical_engine(fd, e) { igt_subtest_group { igt_subtest_f("busy-%s", e->name) { gem_quiescent_gpu(fd); - basic(fd, e->exec_id | e->flags, BUSY); + basic(fd, e->flags, BUSY); } igt_subtest_f("wait-%s", e->name) { gem_quiescent_gpu(fd); - basic(fd, e->exec_id | e->flags, 0); + basic(fd, e->flags, 0); } igt_subtest_f("await-%s", e->name) { gem_quiescent_gpu(fd); - basic(fd, e->exec_id | e->flags, AWAIT); + basic(fd, e->flags, AWAIT); } igt_subtest_f("write-busy-%s", e->name) { gem_quiescent_gpu(fd); - basic(fd, e->exec_id | e->flags, BUSY | WRITE); + basic(fd, e->flags, BUSY | WRITE); } igt_subtest_f("write-wait-%s", e->name) { gem_quiescent_gpu(fd); - basic(fd, e->exec_id | e->flags, WRITE); + basic(fd, e->flags, WRITE); } } } @@ -234,22 +234,22 @@ igt_main basic(fd, ALL_ENGINES, WRITE | HANG); } - for (e = intel_execution_engines; e->name; e++) { + __for_each_physical_engine(fd, e) { igt_subtest_f("hang-busy-%s", e->name) { gem_quiescent_gpu(fd); - basic(fd, e->exec_id | e->flags, HANG | BUSY); + basic(fd, e->flags, HANG | BUSY); } igt_subtest_f("hang-wait-%s", e->name) { gem_quiescent_gpu(fd); - basic(fd, e->exec_id | e->flags, HANG); + basic(fd, e->flags, HANG); } igt_subtest_f("hang-busy-write-%s", e->name) { gem_quiescent_gpu(fd); - basic(fd, e->exec_id | e->flags, HANG | WRITE | BUSY); + basic(fd, e->flags, HANG | WRITE | BUSY); } igt_subtest_f("hang-wait-write-%s", e->name) { gem_quiescent_gpu(fd); - basic(fd, e->exec_id | e->flags, HANG | WRITE); + basic(fd, e->flags, HANG | WRITE); } } |