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: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://lore.kernel.org/r/20251013144552.1710851-1-jani.nikula@intel.com

diff --git a/drivers/gpu/drm/i915/display/intel_display_device.h b/drivers/gpu/drm/i915/display/intel_display_device.h
index 9960ac13a6dd0183a99dd7214b2e6194c817d5b4..8fdb8a0a42821151eaa0217cac958a5559787ac0 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display_device.h
+++ b/drivers/gpu/drm/i915/display/intel_display_device.h
@@ -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)

diff --git a/drivers/gpu/drm/i915/display/intel_fb.c b/drivers/gpu/drm/i915/display/intel_fb.c
index 7388791dfde0a9fedbeb6fda16864d4be0f109f5..9c256a2805e402b5daeba6f7231fa8e6b4f67121 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_fb.c
+++ b/drivers/gpu/drm/i915/display/intel_fb.c
@@ -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 &&

diff --git a/drivers/gpu/drm/i915/display/skl_universal_plane.c b/drivers/gpu/drm/i915/display/skl_universal_plane.c
index e13fb781e7b20b9d4f26844ef5bde48861b5f2f4..0319174adf953914720d7d772c6a6df6170aff98 100644 (file)
--- a/drivers/gpu/drm/i915/display/skl_universal_plane.c
+++ b/drivers/gpu/drm/i915/display/skl_universal_plane.c
@@ -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);

diff --git a/drivers/gpu/drm/xe/compat-i915-headers/i915_drv.h b/drivers/gpu/drm/xe/compat-i915-headers/i915_drv.h
index be3edf20de223dff5fb7006cbb817b75b9814236..7c657ea98a441273113f28f6192b0c5373063d12 100644 (file)
--- a/drivers/gpu/drm/xe/compat-i915-headers/i915_drv.h
+++ b/drivers/gpu/drm/xe/compat-i915-headers/i915_drv.h
@@ -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