[PATCH 12/12] drm/xe/display: Expose AuxCCS frame buffer modifiers

[Rodrigo Vivi]

On Fri, Feb 21, 2025 at 10:17:31AM +0000, Tvrtko Ursulin wrote:
> Now that we have fixed the DPT handling we can undo the nerf which was
> done in cf48bddd31de ("drm/i915/display: Disable AuxCCS framebuffers if
> built for Xe").
> 
> Tested with KDE Wayland, on Lenovo Carbon X1 ADL-P:
> 
> 	[PLANE:32:plane 1A]: type=PRI
> 		uapi: [FB:242] AR30 little-endian (0x30335241),0x100000000000008,2880x1800, visible=visible, src=2880.000000x1800.000000+0.000000+0.000000, dst=2880x1800+0+0, rotation=0 (0x00000001)
> 		hw: [FB:242] AR30 little-endian (0x30335241),0x100000000000008,2880x1800, visible=yes, src=2880.000000x1800.000000+0.000000+0.000000, dst=2880x1800+0+0, rotation=0 (0x00000001)
> 
> Display working fine - no artefacts, no DMAR/PIPE faults.
> 
> Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin at igalia.com>
> References: cf48bddd31de ("drm/i915/display: Disable AuxCCS framebuffers if built for Xe")
> Cc: José Roberto de Souza <jose.souza at intel.com>
> Cc: Juha-Pekka Heikkila <juhapekka.heikkila at gmail.com>
> ---
>  drivers/gpu/drm/i915/display/skl_universal_plane.c | 6 ------
>  1 file changed, 6 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/display/skl_universal_plane.c b/drivers/gpu/drm/i915/display/skl_universal_plane.c
> index 110f66dd5cf0..37438e84203d 100644
> --- a/drivers/gpu/drm/i915/display/skl_universal_plane.c
> +++ b/drivers/gpu/drm/i915/display/skl_universal_plane.c

because this patch is entirely under i915/display, but only for !IS_ENABLED(i915) (which == xe)
I believe the proper subject is something like:

drm/i915/display: Expose AuxCCS frame buffer modifiers for Xe

or something like that, which is the opposite of the commit reference above.

> @@ -2851,12 +2851,6 @@ skl_universal_plane_create(struct intel_display *display,
>  	else
>  		caps = skl_plane_caps(display, pipe, plane_id);
>  
> -	/* FIXME: xe has problems with AUX */
> -	if (!IS_ENABLED(I915) && !HAS_FLAT_CCS(to_i915(display->drm)))
> -		caps &= ~(INTEL_PLANE_CAP_CCS_RC |
> -			  INTEL_PLANE_CAP_CCS_RC_CC |
> -			  INTEL_PLANE_CAP_CCS_MC);
> -
>  	modifiers = intel_fb_plane_get_modifiers(display, caps);
>  
>  	ret = drm_universal_plane_init(display->drm, &plane->base,
> -- 
> 2.48.0
>