diff options
| author | Zbigniew Kempczyński <zbigniew.kempczynski@intel.com> | 2021-08-03 11:15:53 +0200 |
|---|---|---|
| committer | Zbigniew Kempczyński <zbigniew.kempczynski@intel.com> | 2021-08-10 21:02:50 +0200 |
| commit | d268f13c8c1f81f47fafec0c1c88978753470e36 (patch) | |
| tree | 9aaf8f67c4fb2ae8fad6b2acb2be9bafde3e87ef /tests/i915/gem_fenced_exec_thrash.c | |
| parent | 91a485c99a46f777837b3905c98b8f0494bb6985 (diff) | |
tests/gem_fenced_exec_thrash: 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_fenced_exec_thrash.c')
| -rw-r--r-- | tests/i915/gem_fenced_exec_thrash.c | 22 |
1 files changed, 18 insertions, 4 deletions
diff --git a/tests/i915/gem_fenced_exec_thrash.c b/tests/i915/gem_fenced_exec_thrash.c index 6497ff57..a9597d80 100644 --- a/tests/i915/gem_fenced_exec_thrash.c +++ b/tests/i915/gem_fenced_exec_thrash.c @@ -98,7 +98,7 @@ static void run_test(int fd, int num_fences, int expected_errno, struct drm_i915_gem_execbuffer2 execbuf[2]; struct drm_i915_gem_exec_object2 exec[2][2*MAX_FENCES+1]; struct drm_i915_gem_relocation_entry reloc[2*MAX_FENCES]; - + uint64_t ahnd = get_reloc_ahnd(fd, 0); unsigned long count; int i, n; @@ -111,7 +111,19 @@ static void run_test(int fd, int num_fences, int expected_errno, for (n = 0; n < 2*num_fences; n++) { uint32_t handle = tiled_bo_create(fd); - exec[1][2*num_fences - n-1].handle = exec[0][n].handle = handle; + struct drm_i915_gem_exec_object2 *obj0, *obj1; + + obj0 = &exec[0][n]; + obj1 = &exec[1][2*num_fences - n-1]; + + obj1->handle = obj0->handle = handle; + obj1->offset = get_offset(ahnd, handle, OBJECT_SIZE, 0); + obj0->offset = obj1->offset; + + if (ahnd) { + obj0->flags |= EXEC_OBJECT_PINNED; + obj1->flags |= EXEC_OBJECT_PINNED; + } fill_reloc(&reloc[n], handle); } @@ -121,7 +133,7 @@ static void run_test(int fd, int num_fences, int expected_errno, exec[i][2*num_fences].handle = batch_create(fd); exec[i][2*num_fences].relocs_ptr = to_user_pointer(reloc); - exec[i][2*num_fences].relocation_count = 2*num_fences; + exec[i][2*num_fences].relocation_count = !ahnd ? 2*num_fences : 0; execbuf[i].buffers_ptr = to_user_pointer(exec[i]); execbuf[i].buffer_count = 2*num_fences+1; @@ -134,7 +146,7 @@ static void run_test(int fd, int num_fences, int expected_errno, igt_spin_t *spin = NULL; if (flags & BUSY_LOAD) - spin = __igt_spin_new(fd); + spin = __igt_spin_new(fd, .ahnd = ahnd); igt_while_interruptible(flags & INTERRUPTIBLE) { igt_assert_eq(__gem_execbuf(fd, &execbuf[i]), @@ -154,6 +166,8 @@ static void run_test(int fd, int num_fences, int expected_errno, for (i = 0; i < 2; i++) gem_close(fd, exec[i][2*num_fences].handle); + + put_ahnd(ahnd); } igt_main |