[PATCH v2] drm/i915/display: Fix BMG CCS modifiers

[Rodrigo Vivi]

On Fri, Aug 30, 2024 at 04:01:42PM +0300, Juha-Pekka Heikkila wrote:
> Let I915_FORMAT_MOD_4_TILED_BMG_CCS show up as supported modifier
> 
> Fixes: 97c6efb36497 ("drm/i915/display: Plane capability for 64k phys alignment")
> Signed-off-by: Juha-Pekka Heikkila <juhapekka.heikkila at gmail.com>
> ---
> v2: Do platform comparison w/o checking for gfx version
> 
>  drivers/gpu/drm/i915/display/skl_universal_plane.c | 3 +++
>  1 file changed, 3 insertions(+)
> 
> diff --git a/drivers/gpu/drm/i915/display/skl_universal_plane.c b/drivers/gpu/drm/i915/display/skl_universal_plane.c
> index 9452cad41d07..616f5d40a739 100644
> --- a/drivers/gpu/drm/i915/display/skl_universal_plane.c
> +++ b/drivers/gpu/drm/i915/display/skl_universal_plane.c
> @@ -2453,6 +2453,9 @@ static u8 skl_get_plane_caps(struct drm_i915_private *i915,
>  	if (gen12_plane_has_mc_ccs(i915, plane_id))
>  		caps |= INTEL_PLANE_CAP_CCS_MC;
>  
> +	if (IS_BATTLEMAGE(i915) || ((DISPLAY_VER(i915)) >= 20 && IS_DGFX(i915)))

Please let's use only the display version.

either display_ver == 14 && dgfx
or display_ver >=14 && dgfx if you want to be future proof.
But we should avoid the platform check if we can.
The design restriction is at display_14 ip block on bmg itself.


> +		caps |= INTEL_PLANE_CAP_NEED64K_PHYS;
> +
>  	return caps;
>  }
>  
> -- 
> 2.45.2
>