diff options
author | Andi Shyti <andi.shyti@intel.com> | 2019-05-13 02:12:40 +0300 |
---|---|---|
committer | Andi Shyti <andi.shyti@intel.com> | 2019-05-13 03:29:43 +0300 |
commit | cecb7ed86a687ebad36079955bd4174e638efb61 (patch) | |
tree | 4606457fdd71f67336e34f404757552491bbdbf6 | |
parent | 51176eb2c2c1b0eebf9a61be29ff98c5adb36314 (diff) |
test/i915: gem_exec_store: 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>
-rw-r--r-- | tests/i915/gem_exec_store.c | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/tests/i915/gem_exec_store.c b/tests/i915/gem_exec_store.c index a7673489..661ec45a 100644 --- a/tests/i915/gem_exec_store.c +++ b/tests/i915/gem_exec_store.c @@ -37,7 +37,7 @@ #define ENGINE_MASK (I915_EXEC_RING_MASK | LOCAL_I915_EXEC_BSD_MASK) -static void store_dword(int fd, unsigned ring) +static void store_dword(int fd, const struct intel_execution_engine2 *e) { const int gen = intel_gen(intel_get_drm_devid(fd)); struct drm_i915_gem_exec_object2 obj[2]; @@ -46,14 +46,13 @@ static void store_dword(int fd, unsigned ring) uint32_t batch[16]; int i; - gem_require_ring(fd, ring); - igt_require(gem_can_store_dword(fd, ring)); + igt_require(gem_class_can_store_dword(fd, e->class)); intel_detect_and_clear_missed_interrupts(fd); memset(&execbuf, 0, sizeof(execbuf)); execbuf.buffers_ptr = to_user_pointer(obj); execbuf.buffer_count = 2; - execbuf.flags = ring; + execbuf.flags = e->flags; if (gen > 3 && gen < 6) execbuf.flags |= I915_EXEC_SECURE; @@ -97,7 +96,8 @@ static void store_dword(int fd, unsigned ring) } #define PAGES 1 -static void store_cachelines(int fd, unsigned ring, unsigned int flags) +static void store_cachelines(int fd, const struct intel_execution_engine2 *e, + unsigned int flags) { const int gen = intel_gen(intel_get_drm_devid(fd)); struct drm_i915_gem_exec_object2 *obj; @@ -110,13 +110,12 @@ static void store_cachelines(int fd, unsigned ring, unsigned int flags) reloc = calloc(NCACHELINES, sizeof(*reloc)); igt_assert(reloc); - gem_require_ring(fd, ring); - igt_require(gem_can_store_dword(fd, ring)); + igt_require(gem_class_can_store_dword(fd, e->class)); intel_detect_and_clear_missed_interrupts(fd); memset(&execbuf, 0, sizeof(execbuf)); execbuf.buffer_count = flags & PAGES ? NCACHELINES + 1 : 2; - execbuf.flags = ring; + execbuf.flags = e->flags; if (gen > 3 && gen < 6) execbuf.flags |= I915_EXEC_SECURE; @@ -311,7 +310,7 @@ static int print_welcome(int fd) igt_main { - const struct intel_execution_engine *e; + const struct intel_execution_engine2 *e; int fd; igt_fixture { @@ -329,15 +328,15 @@ igt_main igt_fork_hang_detector(fd); } - for (e = intel_execution_engines; e->name; e++) { + __for_each_physical_engine(fd, e) { igt_subtest_f("basic-%s", e->name) - store_dword(fd, e->exec_id | e->flags); + store_dword(fd, e); igt_subtest_f("cachelines-%s", e->name) - store_cachelines(fd, e->exec_id | e->flags, 0); + store_cachelines(fd, e, 0); igt_subtest_f("pages-%s", e->name) - store_cachelines(fd, e->exec_id | e->flags, PAGES); + store_cachelines(fd, e, PAGES); } igt_subtest("basic-all") |