[PATCH i-g-t 17/37] lib/igt_fb: Expose igt_fb_is_ccs_modifier()

[Juha-Pekka Heikkila]

On 3.7.2024 2.27, Ville Syrjala wrote:
> From: Ville Syrjälä <ville.syrjala at linux.intel.com>
> 
> I'm going to need is_ccs_modifier() outside of igt_fb.c.
> Rename it to igt_fb_is_ccs_modifier() and expose it to everyone.
> 
> Signed-off-by: Ville Syrjälä <ville.syrjala at linux.intel.com>
> ---
>   lib/igt_fb.c | 18 ++++++++++--------
>   lib/igt_fb.h |  1 +
>   2 files changed, 11 insertions(+), 8 deletions(-)
> 
> diff --git a/lib/igt_fb.c b/lib/igt_fb.c
> index 80e3c0a48bda..bcb418e0f7be 100644
> --- a/lib/igt_fb.c
> +++ b/lib/igt_fb.c
> @@ -610,7 +610,7 @@ static bool is_gen12_ccs_modifier(uint64_t modifier)
>   		modifier == I915_FORMAT_MOD_4_TILED_MTL_RC_CCS;
>   }
>   
> -static bool is_ccs_modifier(uint64_t modifier)
> +bool igt_fb_is_ccs_modifier(uint64_t modifier)

There's been attempt to have these exposed functions small document 
block about what's here. With that added

Reviewed-by: Juha-Pekka Heikkila <juhapekka.heikkila at gmail.com>

>   {
>   	return is_gen12_ccs_modifier(modifier) ||
>   		modifier == I915_FORMAT_MOD_Y_TILED_CCS ||
> @@ -619,7 +619,8 @@ static bool is_ccs_modifier(uint64_t modifier)
>   
>   static bool is_ccs_plane(const struct igt_fb *fb, int plane)
>   {
> -	if (!is_ccs_modifier(fb->modifier) || HAS_FLATCCS(intel_get_drm_devid(fb->fd)))
> +	if (!igt_fb_is_ccs_modifier(fb->modifier) ||
> +	    HAS_FLATCCS(intel_get_drm_devid(fb->fd)))
>   		return false;
>   
>   	return plane >= fb->num_planes / 2;
> @@ -729,7 +730,8 @@ static int fb_num_planes(const struct igt_fb *fb)
>   {
>   	int num_planes = lookup_drm_format(fb->drm_format)->num_planes;
>   
> -	if (is_ccs_modifier(fb->modifier) && !HAS_FLATCCS(intel_get_drm_devid(fb->fd)))
> +	if (igt_fb_is_ccs_modifier(fb->modifier) &&
> +	    !HAS_FLATCCS(intel_get_drm_devid(fb->fd)))
>   		num_planes *= 2;
>   
>   	if (fb->modifier == I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS_CC ||
> @@ -2482,7 +2484,7 @@ static enum blt_tiling_type fb_tile_to_blt_tile(uint64_t tile)
>   static bool fast_blit_ok(const struct igt_fb *fb)
>   {
>   	return blt_has_fast_copy(fb->fd) &&
> -		!is_ccs_modifier(fb->modifier) &&
> +		!igt_fb_is_ccs_modifier(fb->modifier) &&
>   		blt_fast_copy_supports_tiling(fb->fd,
>   					      fb_tile_to_blt_tile(fb->modifier));
>   }
> @@ -2502,7 +2504,7 @@ static bool ccs_needs_enginecopy(const struct igt_fb *fb)
>   	if (is_gen12_mc_ccs_modifier(fb->modifier))
>   		return true;
>   
> -	if (is_ccs_modifier(fb->modifier) &&
> +	if (igt_fb_is_ccs_modifier(fb->modifier) &&
>   	    !HAS_FLATCCS(intel_get_drm_devid(fb->fd)))
>   		return true;
>   
> @@ -2622,7 +2624,7 @@ igt_fb_create_intel_buf(int fd, struct buf_ops *bops,
>   
>   	igt_assert_eq(fb->offsets[0], 0);
>   
> -	if (is_ccs_modifier(fb->modifier)) {
> +	if (igt_fb_is_ccs_modifier(fb->modifier)) {
>   		igt_assert_eq(fb->strides[0] & 127, 0);
>   
>   		if (is_gen12_ccs_modifier(fb->modifier)) {
> @@ -2666,7 +2668,7 @@ igt_fb_create_intel_buf(int fd, struct buf_ops *bops,
>   	if (buf->format_is_yuv_semiplanar)
>   		buf->yuv_semiplanar_bpp = yuv_semiplanar_bpp(fb->drm_format);
>   
> -	if (is_ccs_modifier(fb->modifier)) {
> +	if (igt_fb_is_ccs_modifier(fb->modifier)) {
>   		num_surfaces = fb->num_planes / (HAS_FLATCCS(intel_get_drm_devid(fb->fd)) ? 1 : 2);
>   		for (i = 0; i < num_surfaces; i++)
>   			init_buf_ccs(buf, i,
> @@ -2799,7 +2801,7 @@ static struct blt_copy_object *allocate_and_initialize_blt(const struct igt_fb *
>   		       intel_get_uc_mocs_index(fb->fd),
>   		       intel_get_pat_idx_uc(fb->fd),
>   		       blt_tile,
> -		       is_ccs_modifier(fb->modifier) ? COMPRESSION_ENABLED : COMPRESSION_DISABLED,
> +		       igt_fb_is_ccs_modifier(fb->modifier) ? COMPRESSION_ENABLED : COMPRESSION_DISABLED,
>   		       is_gen12_mc_ccs_modifier(fb->modifier) ? COMPRESSION_TYPE_MEDIA : COMPRESSION_TYPE_3D);
>   
>   	blt_set_geom(blt, stride, 0, 0, fb->width, fb->plane_height[plane], 0, 0);
> diff --git a/lib/igt_fb.h b/lib/igt_fb.h
> index 2b5040ce3c6b..b1b40b858610 100644
> --- a/lib/igt_fb.h
> +++ b/lib/igt_fb.h
> @@ -181,6 +181,7 @@ void igt_fb_calc_crc(struct igt_fb *fb, igt_crc_t *crc);
>   uint64_t igt_fb_mod_to_tiling(uint64_t modifier);
>   uint64_t igt_fb_tiling_to_mod(uint64_t tiling);
>   
> +bool igt_fb_is_ccs_modifier(uint64_t modifier);
>   bool igt_fb_is_ccs_plane(const struct igt_fb *fb, int plane);
>   bool igt_fb_is_gen12_ccs_cc_plane(const struct igt_fb *fb, int plane);
>   int igt_fb_ccs_to_main_plane(const struct igt_fb *fb, int ccs_plane);