Commit 3a5c5c47 authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/i915/display: add HAS_AUX_CCS() feature check 



We should try to get rid of checks that depend on struct
drm_i915_private (or struct xe_device) in display code. HAS_FLAT_CCS()
is one of them. In the interest of simplicity, add a reversed
HAS_AUX_CCS() feature check macro, as that's we mostly use it for in
display.

v2: include adl-p (Ville)

Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Link: https://lore.kernel.org/r/20251013144552.1710851-1-jani.nikula@intel.com
parent 129c0aa5

drivers/gpu/drm/i915/display/intel_display_device.h

+1 −0
Original line number Diff line number Diff line
@@ -146,6 +146,7 @@ struct intel_display_platforms { 
#define HAS_4TILE(__display)		((__display)->platform.dg2 || DISPLAY_VER(__display) >= 14)

#define HAS_ASYNC_FLIPS(__display)	(DISPLAY_VER(__display) >= 5)

#define HAS_AS_SDP(__display)		(DISPLAY_VER(__display) >= 13)

#define HAS_AUX_CCS(__display)		(IS_DISPLAY_VER(__display, 9, 12) || (__display)->platform.alderlake_p || (__display)->platform.meteorlake)

#define HAS_BIGJOINER(__display)	(DISPLAY_VER(__display) >= 11 && HAS_DSC(__display))

#define HAS_CDCLK_CRAWL(__display)	(DISPLAY_INFO(__display)->has_cdclk_crawl)

#define HAS_CDCLK_SQUASH(__display)	(DISPLAY_INFO(__display)->has_cdclk_squash)

drivers/gpu/drm/i915/display/intel_fb.c

+1 −3
Original line number Diff line number Diff line
@@ -547,8 +547,6 @@ static bool plane_has_modifier(struct intel_display *display, 
			       u8 plane_caps,

			       const struct intel_modifier_desc *md)

{

	struct drm_i915_private *i915 = to_i915(display->drm);



	if (!IS_DISPLAY_VER(display, md->display_ver.from, md->display_ver.until))

		return false;
@@ -560,7 +558,7 @@ static bool plane_has_modifier(struct intel_display *display, 
	 * where supported.

	 */

	if (intel_fb_is_ccs_modifier(md->modifier) &&

	    HAS_FLAT_CCS(i915) != !md->ccs.packed_aux_planes)

	    HAS_AUX_CCS(display) != !!md->ccs.packed_aux_planes)

		return false;



	if (md->modifier == I915_FORMAT_MOD_4_TILED_BMG_CCS &&

drivers/gpu/drm/i915/display/skl_universal_plane.c

+2 −2
Original line number Diff line number Diff line
@@ -1572,7 +1572,7 @@ icl_plane_update_noarm(struct intel_dsb *dsb, 
	}



	/* FLAT CCS doesn't need to program AUX_DIST */

	if (!HAS_FLAT_CCS(to_i915(display->drm)) && DISPLAY_VER(display) < 20)

	if (HAS_AUX_CCS(display))

		intel_de_write_dsb(display, dsb, PLANE_AUX_DIST(pipe, plane_id),

				   skl_plane_aux_dist(plane_state, color_plane));
@@ -2930,7 +2930,7 @@ skl_universal_plane_create(struct intel_display *display, 
		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)))

	if (!IS_ENABLED(I915) && HAS_AUX_CCS(display))

		caps &= ~(INTEL_PLANE_CAP_CCS_RC |

			  INTEL_PLANE_CAP_CCS_RC_CC |

			  INTEL_PLANE_CAP_CCS_MC);

drivers/gpu/drm/xe/compat-i915-headers/i915_drv.h

+0 −2
Original line number Diff line number Diff line
@@ -35,6 +35,4 @@ static inline struct drm_i915_private *to_i915(const struct drm_device *dev) 


#define IS_MOBILE(xe) (xe && 0)



#define HAS_FLAT_CCS(xe) (xe_device_has_flat_ccs(xe))



#endif