diff options
| author | Zbigniew Kempczyński <zbigniew.kempczynski@intel.com> | 2021-07-01 14:33:25 +0200 |
|---|---|---|
| committer | Zbigniew Kempczyński <zbigniew.kempczynski@intel.com> | 2021-08-10 21:02:50 +0200 |
| commit | 8299c52d346a6291b25267b4da678000c8d40397 (patch) | |
| tree | 7db25007ee1eb81ab6f3ab510b54650679c72b34 /tests/i915/gem_workarounds.c | |
| parent | 709e1b45620642f61062923f602439c27ae88c27 (diff) | |
tests/gem_workarounds: Adopt to use allocator
For newer gens we're not able to rely on relocations. Adopt to use
offsets acquired from the allocator.
Signed-off-by: Zbigniew Kempczyński <zbigniew.kempczynski@intel.com>
Cc: Petri Latvala <petri.latvala@intel.com>
Cc: Ashutosh Dixit <ashutosh.dixit@intel.com>
Reviewed-by: Ashutosh Dixit <ashutosh.dixit@intel.com>
Diffstat (limited to 'tests/i915/gem_workarounds.c')
| -rw-r--r-- | tests/i915/gem_workarounds.c | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/tests/i915/gem_workarounds.c b/tests/i915/gem_workarounds.c index e240901c..3d185127 100644 --- a/tests/i915/gem_workarounds.c +++ b/tests/i915/gem_workarounds.c @@ -94,6 +94,7 @@ static int workaround_fail_count(int i915, const intel_ctx_t *ctx) uint32_t *base, *out; igt_spin_t *spin; int fw, fail = 0; + uint64_t ahnd = get_reloc_ahnd(i915, ctx->id); reloc = calloc(num_wa_regs, sizeof(*reloc)); igt_assert(reloc); @@ -109,7 +110,13 @@ static int workaround_fail_count(int i915, const intel_ctx_t *ctx) gem_set_caching(i915, obj[0].handle, I915_CACHING_CACHED); obj[1].handle = gem_create(i915, batch_sz); obj[1].relocs_ptr = to_user_pointer(reloc); - obj[1].relocation_count = num_wa_regs; + obj[1].relocation_count = !ahnd ? num_wa_regs : 0; + if (ahnd) { + obj[0].offset = get_offset(ahnd, obj[0].handle, result_sz, 0); + obj[0].flags |= EXEC_OBJECT_PINNED | EXEC_OBJECT_WRITE; + obj[1].offset = get_offset(ahnd, obj[1].handle, batch_sz, 0); + obj[1].flags |= EXEC_OBJECT_PINNED; + } out = base = gem_mmap__cpu(i915, obj[1].handle, 0, batch_sz, PROT_WRITE); @@ -121,9 +128,9 @@ static int workaround_fail_count(int i915, const intel_ctx_t *ctx) reloc[i].delta = i * sizeof(uint32_t); reloc[i].read_domains = I915_GEM_DOMAIN_INSTRUCTION; reloc[i].write_domain = I915_GEM_DOMAIN_INSTRUCTION; - *out++ = reloc[i].delta; + *out++ = obj[0].offset + reloc[i].delta; if (gen >= 8) - *out++ = 0; + *out++ = (obj[0].offset + reloc[i].delta) >> 32; } *out++ = MI_BATCH_BUFFER_END; munmap(base, batch_sz); @@ -136,7 +143,8 @@ static int workaround_fail_count(int i915, const intel_ctx_t *ctx) gem_set_domain(i915, obj[0].handle, I915_GEM_DOMAIN_CPU, 0); - spin = igt_spin_new(i915, .ctx = ctx, .flags = IGT_SPIN_POLL_RUN); + spin = igt_spin_new(i915, .ahnd = ahnd, .ctx = ctx, + .flags = IGT_SPIN_POLL_RUN); igt_spin_busywait_until_started(spin); fw = igt_open_forcewake_handle(i915); @@ -172,6 +180,7 @@ static int workaround_fail_count(int i915, const intel_ctx_t *ctx) close(fw); igt_spin_free(i915, spin); + put_ahnd(ahnd); gem_close(i915, obj[1].handle); gem_close(i915, obj[0].handle); |