Re: [igt-dev] [PATCH i-g-t 5/5] tests/kms_plane_scaling: Adding Tile-4 support

[Juha-Pekka Heikkila <juhapekka.heikkila@gmail.com>]

On 9.3.2022 18.44, Jeevan B wrote:
> Adding subtest to test new tiling format
> 
> Signed-off-by: Jeevan B <jeevan.b@intel.com>
> ---
>   tests/kms_plane_scaling.c | 11 ++++++++++-
>   1 file changed, 10 insertions(+), 1 deletion(-)
> 
> diff --git a/tests/kms_plane_scaling.c b/tests/kms_plane_scaling.c
> index b91039b0..73975480 100644
> --- a/tests/kms_plane_scaling.c
> +++ b/tests/kms_plane_scaling.c
> @@ -40,6 +40,7 @@ typedef struct {
>   	igt_display_t display;
>   	struct igt_fb fb[4];
>   	bool extended;
> +	bool has_4tile;

this entire has_4tile flag seems mostly harmful. Only place where it is 
used is followed by igt_plane_has_format_mod(..)

>   } data_t;
>   
>   const struct {
> @@ -331,7 +332,8 @@ static const uint64_t modifiers[] = {
>   	DRM_FORMAT_MOD_LINEAR,
>   	I915_FORMAT_MOD_X_TILED,
>   	I915_FORMAT_MOD_Y_TILED,
> -	I915_FORMAT_MOD_Yf_TILED
> +	I915_FORMAT_MOD_Yf_TILED,
> +	I915_FORMAT_MOD_4_TILED
>   };
>   
>   static void test_scaler_with_pixel_format_pipe(data_t *d, int width, int height, bool is_upscale,
> @@ -350,6 +352,10 @@ static void test_scaler_with_pixel_format_pipe(data_t *d, int width, int height,
>   
>   		for (int i = 0; i < ARRAY_SIZE(modifiers); i++) {
>   			uint64_t modifier = modifiers[i];
> +
> +			if (modifier == I915_FORMAT_MOD_4_TILED)
> +				igt_require(d->has_4tile);
> +

I think this will cause this test to skip on all non dg2 boxes?

>   			struct igt_vec tested_formats;
>   
>   			igt_vec_init(&tested_formats, sizeof(uint32_t));
> @@ -682,6 +688,9 @@ igt_main_args("", long_opts, help_str, opt_handler, &data)
>   		data.devid = is_i915_device(data.drm_fd) ?
>   			intel_get_drm_devid(data.drm_fd) : 0;
>   		igt_require(data.display.is_atomic);
> +
> +		data.has_4tile = is_i915_device(data.drm_fd) &&
> +				 intel_get_device_info(intel_get_drm_devid(data.drm_fd))->has_4tile;
>   	}
>   
>   	igt_subtest_group {