drm/i915: Simplify modifier lookup in watermark code

Replace the huge modifier lists in the watermark code with
a few calls to intel_fb.c.

Reviewed-by: Juha-Pekka Heikkila <juhapekka.heikkila@gmail.com>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20221003111544.8007-7-ville.syrjala@linux.intel.com

diff --git a/drivers/gpu/drm/i915/display/intel_fb.c b/drivers/gpu/drm/i915/display/intel_fb.c
index b191915ab351f7e7010ae79c5b7e30f7e3c976c8..cc755cc017c1ed9cf46b94a70c22e03e004eaff3 100644 (file)
--- 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 12386f13a4e0f4f382ab160f0ffc9e8cbb6cf56e..4662b812b9342cec02708ffff8e18e30ccd238a2 100644 (file)
--- 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 aac0980a0c9d25ac5d720e4822381e2fc33972af..d58e667016e465351b9669c40b56f52a80cea7d5 100644 (file)
--- 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);
        wp->is_planar = intel_format_info_is_yuv_semiplanar(format, modifier);
 
        wp->width = width;