[Intel-gfx] [PATCH 5/5] drm/i915: Simplify modifier lookup in watermark code

[Juha-Pekka Heikkila]

I had earlier this patch which look like it does mostly the same 
https://patchwork.freedesktop.org/patch/444010/?series=92491&rev=4

With exception to mc ccs, earlier Imre said mc ccs must not be 
considered here.

/Juha-Pekka

On 30.9.2022 13.43, Ville Syrjala wrote:
> From: Ville Syrjälä <ville.syrjala at linux.intel.com>
> 
> Replace the huge modifier lists in the watermark code with
> a few calls to intel_fb.c.
> 
> Signed-off-by: Ville Syrjälä <ville.syrjala at linux.intel.com>
> ---
>   drivers/gpu/drm/i915/display/intel_fb.c      | 13 ++++++++++++
>   drivers/gpu/drm/i915/display/intel_fb.h      |  1 +
>   drivers/gpu/drm/i915/display/skl_watermark.c | 22 +++-----------------
>   3 files changed, 17 insertions(+), 19 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/display/intel_fb.c b/drivers/gpu/drm/i915/display/intel_fb.c
> index eefa33c555ac..63137ae5ab21 100644
> --- a/drivers/gpu/drm/i915/display/intel_fb.c
> +++ b/drivers/gpu/drm/i915/display/intel_fb.c
> @@ -300,6 +300,19 @@ static bool plane_caps_contain_all(u8 caps, u8 mask)
>   	return (caps & mask) == mask;
>   }
>   
> +/**
> + * intel_fb_is_tiled_modifier: Check if a modifier is a tiled modifier type
> + * @modifier: Modifier to check
> + *
> + * Returns:
> + * Returns %true if @modifier is a tiled modifier.
> + */
> +bool intel_fb_is_tiled_modifier(u64 modifier)
> +{
> +	return plane_caps_contain_any(lookup_modifier(modifier)->plane_caps,
> +				      INTEL_PLANE_CAP_TILING_MASK);
> +}
> +
>   /**
>    * intel_fb_is_ccs_modifier: Check if a modifier is a CCS modifier type
>    * @modifier: Modifier to check
> diff --git a/drivers/gpu/drm/i915/display/intel_fb.h b/drivers/gpu/drm/i915/display/intel_fb.h
> index 12386f13a4e0..4662b812b934 100644
> --- a/drivers/gpu/drm/i915/display/intel_fb.h
> +++ b/drivers/gpu/drm/i915/display/intel_fb.h
> @@ -29,6 +29,7 @@ struct intel_plane_state;
>   #define INTEL_PLANE_CAP_TILING_Yf	BIT(5)
>   #define INTEL_PLANE_CAP_TILING_4	BIT(6)
>   
> +bool intel_fb_is_tiled_modifier(u64 modifier);
>   bool intel_fb_is_ccs_modifier(u64 modifier);
>   bool intel_fb_is_rc_ccs_cc_modifier(u64 modifier);
>   bool intel_fb_is_mc_ccs_modifier(u64 modifier);
> diff --git a/drivers/gpu/drm/i915/display/skl_watermark.c b/drivers/gpu/drm/i915/display/skl_watermark.c
> index 18178b01375e..0715bb308989 100644
> --- a/drivers/gpu/drm/i915/display/skl_watermark.c
> +++ b/drivers/gpu/drm/i915/display/skl_watermark.c
> @@ -1706,26 +1706,10 @@ skl_compute_wm_params(const struct intel_crtc_state *crtc_state,
>   		return -EINVAL;
>   	}
>   
> -	wp->y_tiled = modifier == I915_FORMAT_MOD_Y_TILED ||
> -		      modifier == I915_FORMAT_MOD_4_TILED ||
> -		      modifier == I915_FORMAT_MOD_Yf_TILED ||
> -		      modifier == I915_FORMAT_MOD_Y_TILED_CCS ||
> -		      modifier == I915_FORMAT_MOD_Yf_TILED_CCS ||
> -		      modifier == I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS ||
> -		      modifier == I915_FORMAT_MOD_Y_TILED_GEN12_MC_CCS ||
> -		      modifier == I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS_CC ||
> -		      modifier == I915_FORMAT_MOD_4_TILED_DG2_RC_CCS ||
> -		      modifier == I915_FORMAT_MOD_4_TILED_DG2_MC_CCS ||
> -		      modifier == I915_FORMAT_MOD_4_TILED_DG2_RC_CCS_CC;
>   	wp->x_tiled = modifier == I915_FORMAT_MOD_X_TILED;
> -	wp->rc_surface = modifier == I915_FORMAT_MOD_Y_TILED_CCS ||
> -			 modifier == I915_FORMAT_MOD_Yf_TILED_CCS ||
> -			 modifier == I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS ||
> -			 modifier == I915_FORMAT_MOD_Y_TILED_GEN12_MC_CCS ||
> -			 modifier == I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS_CC ||
> -			 modifier == I915_FORMAT_MOD_4_TILED_DG2_RC_CCS ||
> -			 modifier == I915_FORMAT_MOD_4_TILED_DG2_MC_CCS ||
> -			 modifier == I915_FORMAT_MOD_4_TILED_DG2_RC_CCS_CC;
> +	wp->y_tiled = modifier != I915_FORMAT_MOD_X_TILED &&
> +		intel_fb_is_tiled_modifier(modifier);
> +	wp->rc_surface = intel_fb_is_ccs_modifier(modifier);

I had earlier this patch which look like it did mostly the same 
https://patchwork.freedesktop.org/patch/444010/?series=92491&rev=4

With exception to mc ccs, earlier Imre said mc ccs must not be 
considered here.

/Juha-Pekka

>   	wp->is_planar = intel_format_info_is_yuv_semiplanar(format, modifier);
>   
>   	wp->width = width;