drm/i915: Nuke ilk_get_fdi_m_n_config()

Get rid of the entirely pointless ilk_get_fdi_m_n_config() wrapper
and just call the CPU transcoder function directly.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220128103757.22461-4-ville.syrjala@linux.intel.com
Reviewed-by: Jani Nikula <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 2e194fac37617cd2d992a08b50481ff76d6ad85a..1f4896a1f79ca7e0dca29ac04fde1a1ef1f70ff8 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -3893,13 +3893,6 @@ void intel_cpu_transcoder_get_m_n(struct intel_crtc *crtc,
        }
 }
 
-void ilk_get_fdi_m_n_config(struct intel_crtc *crtc,
-                           struct intel_crtc_state *pipe_config)
-{
-       intel_cpu_transcoder_get_m_n(crtc, pipe_config->cpu_transcoder,
-                                    &pipe_config->fdi_m_n, NULL);
-}
-
 static void ilk_get_pfit_pos_size(struct intel_crtc_state *crtc_state,
                                  u32 pos, u32 size)
 {

diff --git a/drivers/gpu/drm/i915/display/intel_display.h b/drivers/gpu/drm/i915/display/intel_display.h
index ac05ee47c6a7d80308d0d8b5e39ddcbf712eb2da..2747a7f2c6cd9bcf3dbc7c050485230db70b8b74 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display.h
+++ b/drivers/gpu/drm/i915/display/intel_display.h
@@ -613,8 +613,6 @@ void intel_cpu_transcoder_get_m_n(struct intel_crtc *crtc,
                                  struct intel_link_m_n *m2_n2);
 void intel_pch_transcoder_get_m_n(struct intel_crtc *crtc,
                                  struct intel_link_m_n *m_n);
-void ilk_get_fdi_m_n_config(struct intel_crtc *crtc,
-                           struct intel_crtc_state *pipe_config);
 void i9xx_crtc_clock_get(struct intel_crtc *crtc,
                         struct intel_crtc_state *pipe_config);
 int intel_dotclock_calculate(int link_freq, const struct intel_link_m_n *m_n);

diff --git a/drivers/gpu/drm/i915/display/intel_pch_display.c b/drivers/gpu/drm/i915/display/intel_pch_display.c
index 7ef2d40997b2e4bdc509c070bbcffa35d304ac8a..b464633b551b3a09b0d2031f86a6a6997cddb185 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_pch_display.c
+++ b/drivers/gpu/drm/i915/display/intel_pch_display.c
@@ -386,7 +386,8 @@ void ilk_pch_get_config(struct intel_crtc_state *crtc_state)
        crtc_state->fdi_lanes = ((FDI_DP_PORT_WIDTH_MASK & tmp) >>
                                 FDI_DP_PORT_WIDTH_SHIFT) + 1;
 
-       ilk_get_fdi_m_n_config(crtc, crtc_state);
+       intel_cpu_transcoder_get_m_n(crtc, crtc_state->cpu_transcoder,
+                                    &crtc_state->fdi_m_n, NULL);
 
        if (HAS_PCH_IBX(dev_priv)) {
                /*
@@ -509,7 +510,8 @@ void lpt_pch_get_config(struct intel_crtc_state *crtc_state)
        crtc_state->fdi_lanes = ((FDI_DP_PORT_WIDTH_MASK & tmp) >>
                                 FDI_DP_PORT_WIDTH_SHIFT) + 1;
 
-       ilk_get_fdi_m_n_config(crtc, crtc_state);
+       intel_cpu_transcoder_get_m_n(crtc, crtc_state->cpu_transcoder,
+                                    &crtc_state->fdi_m_n, NULL);
 
        crtc_state->hw.adjusted_mode.crtc_clock = lpt_get_iclkip(dev_priv);
 }