diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2020-01-28 12:18:42 +0000 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2020-01-28 12:52:08 +0000 |
| commit | 9b8b789ef15f8b5abdfbe2684cae234164254cda (patch) | |
| tree | d588347147a7baaf1b18e5ca2292d800388219e0 | |
| parent | fb8487a63fcbe1c129206c9303bfcd5feb0e3ee1 (diff) | |
i915/gem_exec_balancer: Convert to use gem_mmap__device_coherent()
Replace gem_mmap_gtt and write-once mmaps with
gem_mmap__device_coherent.
For use as an invalid pointer, we need only worry about having an
mmap_offset (gtt or wc) as they work alike inside the kernel with
respect to locking. (GTT has the extra vm->mutex, but if there's no
aperture, there's never going to be such a mutex to worry about!)
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Mika Kuoppala <mika.kuoppala@linux.intel.com>
| -rw-r--r-- | tests/i915/gem_exec_balancer.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/tests/i915/gem_exec_balancer.c b/tests/i915/gem_exec_balancer.c index 6b0c47f09..150eba0db 100644 --- a/tests/i915/gem_exec_balancer.c +++ b/tests/i915/gem_exec_balancer.c @@ -278,7 +278,8 @@ static void invalid_balancer(int i915) igt_assert_eq(__gem_context_set_param(i915, &p), -EFAULT); handle = gem_create(i915, 4096 * 3); - ptr = gem_mmap__gtt(i915, handle, 4096 * 3, PROT_WRITE); + ptr = gem_mmap__device_coherent(i915, handle, 0, 4096 * 3, + PROT_WRITE); gem_close(i915, handle); memset(&engines, 0, sizeof(engines)); @@ -369,7 +370,7 @@ static void invalid_bonds(int i915) gem_context_set_param(i915, &p); handle = gem_create(i915, 4096 * 3); - ptr = gem_mmap__gtt(i915, handle, 4096 * 3, PROT_WRITE); + ptr = gem_mmap__device_coherent(i915, handle, 0, 4096 * 3, PROT_WRITE); gem_close(i915, handle); memcpy(ptr + 4096, &bonds[0], sizeof(bonds[0])); @@ -720,7 +721,7 @@ static uint32_t create_semaphore_to_spinner(int i915, igt_spin_t *spin) uint64_t addr; handle = gem_create(i915, 4096); - cs = map = gem_mmap__cpu(i915, handle, 0, 4096, PROT_WRITE); + cs = map = gem_mmap__device_coherent(i915, handle, 0, 4096, PROT_WRITE); /* Wait until the spinner is running */ addr = spin->obj[0].offset + 4 * SPIN_POLL_START_IDX; |