[PATCH i-g-t 2/8] tests/intel: prefer intel_buf_init_in_region()

[Zbigniew Kempczyński]

On Fri, Feb 09, 2024 at 06:34:27PM +0000, Matthew Auld wrote:
> We want to get rid of intel_buf_init_using_handle(), in favour of
> something where bo_size is always passed in. It looks like we can
> instead just use intel_buf_init_in_region() here.
> 
> Signed-off-by: Matthew Auld <matthew.auld at intel.com>
> Cc: Zbigniew Kempczyński <zbigniew.kempczynski at intel.com>
> ---
>  tests/intel/gem_gpgpu_fill.c   | 7 ++-----
>  tests/intel/gem_media_fill.c   | 7 ++-----
>  tests/intel/i915_pipe_stress.c | 8 +++-----
>  tests/intel/i915_pm_rpm.c      | 8 +++-----
>  4 files changed, 10 insertions(+), 20 deletions(-)
> 
> diff --git a/tests/intel/gem_gpgpu_fill.c b/tests/intel/gem_gpgpu_fill.c
> index 25f2a96c1..ac283620e 100644
> --- a/tests/intel/gem_gpgpu_fill.c
> +++ b/tests/intel/gem_gpgpu_fill.c
> @@ -78,7 +78,6 @@ create_buf(data_t *data, int width, int height, uint8_t color, uint32_t region)
>  {
>  	struct intel_buf *buf;
>  	uint8_t *ptr;
> -	uint32_t handle;
>  	int i;
>  
>  	buf = calloc(1, sizeof(*buf));
> @@ -88,10 +87,8 @@ create_buf(data_t *data, int width, int height, uint8_t color, uint32_t region)
>  	 * Legacy code uses 32 bpp after buffer creation.
>  	 * Let's do the same due to keep shader intact.
>  	 */
> -	handle = gem_create_in_memory_regions(data->drm_fd, SIZE, region);
> -	intel_buf_init_using_handle(data->bops, handle, buf,
> -				    width/4, height, 32, 0,
> -				    I915_TILING_NONE, 0);
> +	intel_buf_init_in_region(data->bops, buf, width/4, height, 32, 0,
> +				 I915_TILING_NONE, 0, region);
>  
>  	ptr = gem_mmap__cpu_coherent(data->drm_fd, buf->handle, 0,
>  				     buf->surface[0].size, PROT_WRITE);
> diff --git a/tests/intel/gem_media_fill.c b/tests/intel/gem_media_fill.c
> index a678d2f99..79a06f7b8 100644
> --- a/tests/intel/gem_media_fill.c
> +++ b/tests/intel/gem_media_fill.c
> @@ -75,21 +75,18 @@ static struct intel_buf *
>  create_buf(data_t *data, int width, int height, uint8_t color, uint32_t region)
>  {
>  	struct intel_buf *buf;
> -	uint32_t handle;
>  	uint8_t *ptr;
>  	int i;
>  
>  	buf = calloc(1, sizeof(*buf));
>  	igt_assert(buf);
>  
> -	handle = gem_create_in_memory_regions(data->drm_fd, SIZE, region);
> -
>  	/*
>  	 * Legacy code uses 32 bpp after buffer creation.
>  	 * Let's do the same due to keep shader intact.
>  	 */
> -	intel_buf_init_using_handle(data->bops, handle, buf, width/4,
> -				    height, 32, 0, I915_TILING_NONE, 0);
> +	intel_buf_init_in_region(data->bops, buf, width/4, height, 32, 0,
> +				 I915_TILING_NONE, 0, region);
>  
>  	ptr = gem_mmap__cpu_coherent(data->drm_fd, buf->handle, 0,
>  				     buf->surface[0].size, PROT_WRITE);
> diff --git a/tests/intel/i915_pipe_stress.c b/tests/intel/i915_pipe_stress.c
> index f9da5f023..79f83d266 100644
> --- a/tests/intel/i915_pipe_stress.c
> +++ b/tests/intel/i915_pipe_stress.c
> @@ -192,7 +192,6 @@ static struct intel_buf *
>  create_buf(struct data *data, int width, int height, uint32_t region)
>  {
>  	struct intel_buf *buf;
> -	uint32_t handle;
>  
>  	buf = calloc(1, sizeof(*buf));
>  	igt_assert(buf);
> @@ -201,10 +200,9 @@ create_buf(struct data *data, int width, int height, uint32_t region)
>  	 * Legacy code uses 32 bpp after buffer creation.
>  	 * Let's do the same due to keep shader intact.
>  	 */
> -	handle = gem_create_in_memory_regions(data->drm_fd, width * height, region);
> -	intel_buf_init_using_handle(data->bops, handle, buf,
> -				    width/4, height, 32, 0,
> -				    I915_TILING_NONE, 0);
> +	intel_buf_init_in_region(data->bops, buf,
> +				 width/4, height, 32, 0,
> +				 I915_TILING_NONE, 0, region);
>  
>  	return buf;
>  }
> diff --git a/tests/intel/i915_pm_rpm.c b/tests/intel/i915_pm_rpm.c
> index 2b0a63bde..7f64d1069 100644
> --- a/tests/intel/i915_pm_rpm.c
> +++ b/tests/intel/i915_pm_rpm.c
> @@ -218,7 +218,6 @@ create_buf(struct data_t *data, uint32_t color)
>  {
>  	struct intel_buf *buf;
>  	uint8_t *ptr;
> -	uint32_t handle;
>  	struct buf_ops *bops;
>  	int i;
>  
> @@ -226,10 +225,9 @@ create_buf(struct data_t *data, uint32_t color)
>  	igt_assert(buf);
>  	bops = buf_ops_create(drm_fd);
>  
> -	handle = gem_create_in_memory_regions(drm_fd, SIZE, data->region);
> -	intel_buf_init_using_handle(bops, handle, buf,
> -				    data->width / 4, data->height, 32, 0,
> -				    I915_TILING_NONE, 0);
> +	intel_buf_init_in_region(bops, buf,
> +				 data->width / 4, data->height, 32, 0,
> +				 I915_TILING_NONE, 0, data->region);
>  
>  	ptr = gem_mmap__cpu_coherent(drm_fd, buf->handle, 0,
>  				     buf->surface[0].size, PROT_WRITE);
> -- 
> 2.43.0
> 

LGTM,

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

--
Zbigniew