[igt-dev] [PATCH i-g-t 2/2] tests/i915/gem_softpin: Adjust the addresses of reverved blocks

[Zbigniew Kempczyński]

On Thu, Jul 22, 2021 at 10:24:26AM +0200, Andrzej Turko wrote:
> Make sure that the reservations fit in the address space.
> 
> Signed-off-by: Andrzej Turko <andrzej.turko at linux.intel.com>
> Cc: Zbigniew Kempczyński <zbigniew.kempczynski at intel.com>
> ---
>  tests/i915/gem_softpin.c | 7 ++++---
>  1 file changed, 4 insertions(+), 3 deletions(-)
> 
> diff --git a/tests/i915/gem_softpin.c b/tests/i915/gem_softpin.c
> index bdb04821d..5e47a0ce3 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);

Agree, assumption vm is between <0, gtt size> is wrong and better
is to check its ranges before reserving offsets inside.

Reviewed-by: Zbigniew Kempczyński <zbigniew.kempczynski at intel.com>

--
Zbigniew

>  
>  	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,
> -- 
> 2.25.1
>