diff options
| author | Zbigniew Kempczyński <zbigniew.kempczynski@intel.com> | 2021-08-12 05:39:01 +0200 |
|---|---|---|
| committer | Zbigniew Kempczyński <zbigniew.kempczynski@intel.com> | 2021-08-13 09:37:24 +0200 |
| commit | 5df1609968e688b253cbea5b5bf06c26f1673738 (patch) | |
| tree | 3d3151290cbd6d5f70d05d377f7909e81d796a2f /tests/i915/gem_exec_big.c | |
| parent | 9aa53686e2a72ef08e15877d8758f0d73b526ebf (diff) | |
tests/gem_exec_big: Skip relocation part
When running on platforms without relocation support, verification
of their correctness should be skipped. What remains is exercising
submission of large batches.
Signed-off-by: Andrzej Turko <andrzej.turko@linux.intel.com>
Signed-off-by: Zbigniew Kempczyński <zbigniew.kempczynski@intel.com>
Cc: Petri Latvala <petri.latvala@intel.com>
Cc: Ashutosh Dixit <ashutosh.dixit@intel.com>
Diffstat (limited to 'tests/i915/gem_exec_big.c')
| -rw-r--r-- | tests/i915/gem_exec_big.c | 21 |
1 files changed, 16 insertions, 5 deletions
diff --git a/tests/i915/gem_exec_big.c b/tests/i915/gem_exec_big.c index 1f8c720b..90230fc3 100644 --- a/tests/i915/gem_exec_big.c +++ b/tests/i915/gem_exec_big.c @@ -55,6 +55,7 @@ IGT_TEST_DESCRIPTION("Run a large nop batch to stress test the error capture" #define FORCE_PREAD_PWRITE 0 static int use_64bit_relocs; +static bool has_relocs; static void exec1(int fd, uint32_t handle, uint64_t reloc_ofs, unsigned flags, char *ptr) { @@ -70,7 +71,7 @@ static void exec1(int fd, uint32_t handle, uint64_t reloc_ofs, unsigned flags, c gem_reloc[0].presumed_offset = 0; gem_exec[0].handle = handle; - gem_exec[0].relocation_count = 1; + gem_exec[0].relocation_count = has_relocs ? 1 : 0; gem_exec[0].relocs_ptr = to_user_pointer(gem_reloc); gem_exec[0].alignment = 0; gem_exec[0].offset = 0; @@ -100,6 +101,9 @@ static void exec1(int fd, uint32_t handle, uint64_t reloc_ofs, unsigned flags, c igt_warn_on(gem_reloc[0].presumed_offset == -1); gem_set_domain(fd, gem_exec[0].handle, I915_GEM_DOMAIN_WC, 0); + if (!has_relocs) + return; + if (use_64bit_relocs) { uint64_t tmp; if (ptr) @@ -134,11 +138,13 @@ static void execN(int fd, uint32_t handle, uint64_t batch_size, unsigned flags, #define reloc_ofs(N, T) ((((N)+1) << 12) - 4*(1 + ((N) == ((T)-1)))) struct drm_i915_gem_execbuffer2 execbuf; struct drm_i915_gem_exec_object2 gem_exec[1]; - struct drm_i915_gem_relocation_entry *gem_reloc; - uint64_t n, nreloc = batch_size >> 12; + struct drm_i915_gem_relocation_entry *gem_reloc = NULL; + uint64_t n, nreloc = has_relocs ? batch_size >> 12 : 0; - gem_reloc = calloc(nreloc, sizeof(*gem_reloc)); - igt_assert(gem_reloc); + if (has_relocs) { + gem_reloc = calloc(nreloc, sizeof(*gem_reloc)); + igt_assert(gem_reloc); + } for (n = 0; n < nreloc; n++) { gem_reloc[n].offset = reloc_ofs(n, nreloc); @@ -173,6 +179,10 @@ static void execN(int fd, uint32_t handle, uint64_t batch_size, unsigned flags, igt_permute_array(gem_reloc, nreloc, xchg_reloc); gem_execbuf(fd, &execbuf); + + if (!has_relocs) + return; + for (n = 0; n < nreloc; n++) { if (igt_warn_on(gem_reloc[n].presumed_offset == -1)) break; @@ -305,6 +315,7 @@ igt_main igt_require_gem(i915); use_64bit_relocs = intel_gen(intel_get_drm_devid(i915)) >= 8; + has_relocs = gem_has_relocations(i915); } igt_subtest("single") |