drm/i915: move is_ccs_modifier to an inline

There is no need for this to be out of line.

Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/bb73a151b7b780f927edeb7e121449446592805d.1612536383.git.jani.nikula@intel.com

diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
index 257954cb7426857ceae9bb4bc2dc78077de2e79e..e9e8a5233b985d81aa7faa06c7304dca827419db 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -1826,15 +1826,6 @@ intel_get_format_info(const struct drm_mode_fb_cmd2 *cmd)
        }
 }
 
-bool is_ccs_modifier(u64 modifier)
-{
-       return modifier == I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS ||
-              modifier == I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS_CC ||
-              modifier == I915_FORMAT_MOD_Y_TILED_GEN12_MC_CCS ||
-              modifier == I915_FORMAT_MOD_Y_TILED_CCS ||
-              modifier == I915_FORMAT_MOD_Yf_TILED_CCS;
-}
-
 static int gen12_ccs_aux_stride(struct drm_framebuffer *fb, int ccs_plane)
 {
        return DIV_ROUND_UP(fb->pitches[skl_ccs_to_main_plane(fb, ccs_plane)],

diff --git a/drivers/gpu/drm/i915/display/intel_display.h b/drivers/gpu/drm/i915/display/intel_display.h
index 3c153eb7809213d8d579e61401cbd4c24bce913b..2bbd2ee9147e891fb2b05acbdfe7f5e5074f450b 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display.h
+++ b/drivers/gpu/drm/i915/display/intel_display.h
@@ -517,7 +517,6 @@ void intel_link_compute_m_n(u16 bpp, int nlanes,
                            int pixel_clock, int link_clock,
                            struct intel_link_m_n *m_n,
                            bool constant_n, bool fec_enable);
-bool is_ccs_modifier(u64 modifier);
 void lpt_disable_clkout_dp(struct drm_i915_private *dev_priv);
 u32 intel_plane_fb_max_stride(struct drm_i915_private *dev_priv,
                              u32 pixel_format, u64 modifier);

diff --git a/drivers/gpu/drm/i915/display/intel_display_types.h b/drivers/gpu/drm/i915/display/intel_display_types.h
index 6183f2f0424bf6e2b22eba54a0c7bc2a57fd5f23..ebaa9d0ed376bd58995830d2b65c1b0bfc4ae4e7 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display_types.h
+++ b/drivers/gpu/drm/i915/display/intel_display_types.h
@@ -1946,6 +1946,15 @@ static inline u32 intel_fdi_link_freq(struct drm_i915_private *dev_priv,
                return dev_priv->fdi_pll_freq;
 }
 
+static inline bool is_ccs_modifier(u64 modifier)
+{
+       return modifier == I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS ||
+              modifier == I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS_CC ||
+              modifier == I915_FORMAT_MOD_Y_TILED_GEN12_MC_CCS ||
+              modifier == I915_FORMAT_MOD_Y_TILED_CCS ||
+              modifier == I915_FORMAT_MOD_Yf_TILED_CCS;
+}
+
 static inline bool is_ccs_plane(const struct drm_framebuffer *fb, int plane)
 {
        if (!is_ccs_modifier(fb->modifier))