[igt-dev] [PATCH i-g-t v3 9/9] tests/gem_ccs: Check for extended block-copy and compression support

[Zbigniew Kempczyński]

On Thu, Feb 09, 2023 at 03:12:12PM +0100, Karolina Stolarek wrote:
> Use a helper that checks blitter command flags instead of directly
> checking Flat CCS compression support. Check for extended block-copy
> command when initializing the copy object in block_copy and
> block_multicopy tests.
> 
> Signed-off-by: Karolina Stolarek <karolina.stolarek at intel.com>

Whole series look good for me now, this patch too:

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

--
Zbigniew

> ---
>  lib/i915/i915_blt.c  | 17 -----------------
>  lib/i915/i915_blt.h  |  1 -
>  tests/i915/gem_ccs.c |  7 +++----
>  3 files changed, 3 insertions(+), 22 deletions(-)
> 
> diff --git a/lib/i915/i915_blt.c b/lib/i915/i915_blt.c
> index 9b32a0e9..63eba4ac 100644
> --- a/lib/i915/i915_blt.c
> +++ b/lib/i915/i915_blt.c
> @@ -191,23 +191,6 @@ struct gen12_block_copy_data_ext {
>  	} dw21;
>  };
>  
> -/**
> - * blt_supports_compression:
> - * @i915: drm fd
> - *
> - * Function checks if HW supports flatccs compression in blitter commands
> - * on @i915 device.
> - *
> - * Returns:
> - * true if it does, false otherwise.
> - */
> -bool blt_supports_compression(int i915)
> -{
> -	uint32_t devid = intel_get_drm_devid(i915);
> -
> -	return HAS_FLATCCS(devid);
> -}
> -
>  /**
>   * blt_supports_command:
>   * @cmds_info: Copy commands description struct
> diff --git a/lib/i915/i915_blt.h b/lib/i915/i915_blt.h
> index 6634533b..c535961e 100644
> --- a/lib/i915/i915_blt.h
> +++ b/lib/i915/i915_blt.h
> @@ -157,7 +157,6 @@ struct blt_ctrl_surf_copy_data {
>  	bool print_bb;
>  };
>  
> -bool blt_supports_compression(int i915);
>  bool blt_supports_command(const struct intel_cmds_info *cmds_info,
>  			  enum blt_cmd_type cmd);
>  bool blt_cmd_supports_tiling(const struct intel_cmds_info *cmds_info,
> diff --git a/tests/i915/gem_ccs.c b/tests/i915/gem_ccs.c
> index a24c8e1f..b7e8bda7 100644
> --- a/tests/i915/gem_ccs.c
> +++ b/tests/i915/gem_ccs.c
> @@ -346,7 +346,6 @@ static void block_copy(int i915,
>  	uint32_t run_id = mid_tiling;
>  	uint32_t mid_region = region2, bb;
>  	uint32_t width = param.width, height = param.height;
> -	uint32_t devid = intel_get_drm_devid(i915);
>  	enum blt_compression mid_compression = config->compression;
>  	int mid_compression_format = param.compression_format;
>  	enum blt_compression_type comp_type = COMPRESSION_TYPE_3D;
> @@ -355,7 +354,7 @@ static void block_copy(int i915,
>  
>  	igt_assert(__gem_create_in_memory_regions(i915, &bb, &bb_size, region1) == 0);
>  
> -	if (!blt_supports_compression(i915) && !IS_METEORLAKE(devid))
> +	if (!blt_uses_extended_block_copy(i915))
>  		pext = NULL;
>  
>  	src = blt_create_object(i915, region1, width, height, bpp, uc_mocs,
> @@ -470,7 +469,7 @@ static void block_multicopy(int i915,
>  
>  	igt_assert(__gem_create_in_memory_regions(i915, &bb, &bb_size, region1) == 0);
>  
> -	if (!blt_supports_compression(i915))
> +	if (!blt_uses_extended_block_copy(i915))
>  		pext3 = NULL;
>  
>  	src = blt_create_object(i915, region1, width, height, bpp, uc_mocs,
> @@ -557,7 +556,7 @@ static void block_copy_test(int i915,
>  	const struct intel_execution_engine2 *e;
>  	int tiling;
>  
> -	if (config->compression && !blt_supports_compression(i915))
> +	if (config->compression && !blt_block_copy_supports_compression(i915))
>  		return;
>  
>  	if (config->inplace && !config->compression)
> -- 
> 2.25.1
>