diff options
| author | Andrzej Turko <andrzej.turko@linux.intel.com> | 2021-07-22 10:24:26 +0200 |
|---|---|---|
| committer | Zbigniew Kempczyński <zbigniew.kempczynski@intel.com> | 2021-07-28 19:16:50 +0200 |
| commit | deedcb19edc2fc6f088faa7672d3bfa05dc24c7a (patch) | |
| tree | 0abc814100b23f0164f1ce85cb0fa1e61e88346b | |
| parent | a75355ad2928d9e73a058a790d9a0f03d86ad73d (diff) | |
tests/i915/gem_softpin: Adjust the addresses of reverved blocks
Make sure that the reservations fit in the address space.
Signed-off-by: Andrzej Turko <andrzej.turko@linux.intel.com>
Cc: Zbigniew Kempczyński <zbigniew.kempczynski@intel.com>
Reviewed-by: Zbigniew Kempczyński <zbigniew.kempczynski@intel.com>
| -rw-r--r-- | tests/i915/gem_softpin.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/tests/i915/gem_softpin.c b/tests/i915/gem_softpin.c index bdb04821..5e47a0ce 100644 --- a/tests/i915/gem_softpin.c +++ b/tests/i915/gem_softpin.c @@ -703,7 +703,7 @@ static void __reserve(uint64_t ahnd, int i915, bool pinned, struct drm_i915_gem_exec_object2 *objects, int num_obj, uint64_t size) { - uint64_t gtt = gem_aperture_size(i915); + uint64_t start, end; unsigned int flags; int i; @@ -714,13 +714,14 @@ static void __reserve(uint64_t ahnd, int i915, bool pinned, flags |= EXEC_OBJECT_PINNED; memset(objects, 0, sizeof(objects) * num_obj); + intel_allocator_get_address_range(ahnd, &start, &end); for (i = 0; i < num_obj; i++) { objects[i].handle = gem_create(i915, size); if (i < num_obj/2) - objects[i].offset = i * size; + objects[i].offset = start + i * size; else - objects[i].offset = gtt - (i + 1 - num_obj/2) * size; + objects[i].offset = end - (i + 1 - num_obj/2) * size; objects[i].flags = flags; intel_allocator_reserve(ahnd, objects[i].handle, |