drm/i915: Nuke intel_dp_set_m_n()

I want to make a clean split betwen the CPU vs. PCH transcoder
programming. To that end eliminate intel_dp_set_m_n() and just
call the individual CPU/PCH transcoder functions directly.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220128103757.22461-2-ville.syrjala@linux.intel.com
Reviewed-by: Jani Nikula <jani.nikula@intel.com>

diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c b/drivers/gpu/drm/i915/display/intel_ddi.c
index ca8becb07e45eb4f0e36ef5d073e2ffe79e71487..41342a1333cf23f4bb83676408cd01144eb8b76f 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_ddi.c
+++ b/drivers/gpu/drm/i915/display/intel_ddi.c
@@ -2510,7 +2510,9 @@ static void intel_ddi_pre_enable_dp(struct intel_atomic_state *state,
        if (!intel_crtc_has_type(crtc_state, INTEL_OUTPUT_DP_MST)) {
                intel_ddi_set_dp_msa(crtc_state, conn_state);
 
-               intel_dp_set_m_n(crtc_state, M1_N1);
+               intel_cpu_transcoder_set_m_n(crtc_state,
+                                            &crtc_state->dp_m_n,
+                                            &crtc_state->dp_m2_n2);
        }
 }
 

diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
index 7728795ee26db6e637ddc240bc1bb09be4601482..af2b095a805b624143daab59c4e5b31b2bf07bbb 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -118,9 +118,8 @@
 
 static void intel_set_transcoder_timings(const struct intel_crtc_state *crtc_state);
 static void intel_set_pipe_src_size(const struct intel_crtc_state *crtc_state);
-static void intel_cpu_transcoder_set_m_n(const struct intel_crtc_state *crtc_state,
-                                        const struct intel_link_m_n *m_n,
-                                        const struct intel_link_m_n *m2_n2);
+static void intel_pch_transcoder_set_m_n(const struct intel_crtc_state *crtc_state,
+                                        const struct intel_link_m_n *m_n);
 static void i9xx_set_pipeconf(const struct intel_crtc_state *crtc_state);
 static void ilk_set_pipeconf(const struct intel_crtc_state *crtc_state);
 static void hsw_set_transconf(const struct intel_crtc_state *crtc_state);
@@ -1835,8 +1834,15 @@ static void ilk_crtc_enable(struct intel_atomic_state *state,
        intel_set_cpu_fifo_underrun_reporting(dev_priv, pipe, false);
        intel_set_pch_fifo_underrun_reporting(dev_priv, pipe, false);
 
-       if (intel_crtc_has_dp_encoder(new_crtc_state))
-               intel_dp_set_m_n(new_crtc_state, M1_N1);
+       if (intel_crtc_has_dp_encoder(new_crtc_state)) {
+               if (new_crtc_state->has_pch_encoder)
+                       intel_pch_transcoder_set_m_n(new_crtc_state,
+                                                    &new_crtc_state->dp_m_n);
+               else
+                       intel_cpu_transcoder_set_m_n(new_crtc_state,
+                                                    &new_crtc_state->dp_m_n,
+                                                    &new_crtc_state->dp_m2_n2);
+       }
 
        intel_set_transcoder_timings(new_crtc_state);
        intel_set_pipe_src_size(new_crtc_state);
@@ -2450,7 +2456,9 @@ static void valleyview_crtc_enable(struct intel_atomic_state *state,
                return;
 
        if (intel_crtc_has_dp_encoder(new_crtc_state))
-               intel_dp_set_m_n(new_crtc_state, M1_N1);
+               intel_cpu_transcoder_set_m_n(new_crtc_state,
+                                            &new_crtc_state->dp_m_n,
+                                            &new_crtc_state->dp_m2_n2);
 
        intel_set_transcoder_timings(new_crtc_state);
        intel_set_pipe_src_size(new_crtc_state);
@@ -2502,7 +2510,9 @@ static void i9xx_crtc_enable(struct intel_atomic_state *state,
                return;
 
        if (intel_crtc_has_dp_encoder(new_crtc_state))
-               intel_dp_set_m_n(new_crtc_state, M1_N1);
+               intel_cpu_transcoder_set_m_n(new_crtc_state,
+                                            &new_crtc_state->dp_m_n,
+                                            &new_crtc_state->dp_m2_n2);
 
        intel_set_transcoder_timings(new_crtc_state);
        intel_set_pipe_src_size(new_crtc_state);
@@ -3149,9 +3159,9 @@ static bool transcoder_has_m2_n2(struct drm_i915_private *dev_priv,
        return DISPLAY_VER(dev_priv) == 7 || IS_CHERRYVIEW(dev_priv);
 }
 
-static void intel_cpu_transcoder_set_m_n(const struct intel_crtc_state *crtc_state,
-                                        const struct intel_link_m_n *m_n,
-                                        const struct intel_link_m_n *m2_n2)
+void intel_cpu_transcoder_set_m_n(const struct intel_crtc_state *crtc_state,
+                                 const struct intel_link_m_n *m_n,
+                                 const struct intel_link_m_n *m2_n2)
 {
        struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc);
        struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
@@ -3179,32 +3189,6 @@ static void intel_cpu_transcoder_set_m_n(const struct intel_crtc_state *crtc_sta
        }
 }
 
-void intel_dp_set_m_n(const struct intel_crtc_state *crtc_state, enum link_m_n_set m_n)
-{
-       const struct intel_link_m_n *dp_m_n, *dp_m2_n2 = NULL;
-       struct drm_i915_private *i915 = to_i915(crtc_state->uapi.crtc->dev);
-
-       if (m_n == M1_N1) {
-               dp_m_n = &crtc_state->dp_m_n;
-               dp_m2_n2 = &crtc_state->dp_m2_n2;
-       } else if (m_n == M2_N2) {
-
-               /*
-                * M2_N2 registers are not supported. Hence m2_n2 divider value
-                * needs to be programmed into M1_N1.
-                */
-               dp_m_n = &crtc_state->dp_m2_n2;
-       } else {
-               drm_err(&i915->drm, "Unsupported divider value\n");
-               return;
-       }
-
-       if (crtc_state->has_pch_encoder)
-               intel_pch_transcoder_set_m_n(crtc_state, &crtc_state->dp_m_n);
-       else
-               intel_cpu_transcoder_set_m_n(crtc_state, dp_m_n, dp_m2_n2);
-}
-
 static void intel_set_transcoder_timings(const struct intel_crtc_state *crtc_state)
 {
        struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc);

diff --git a/drivers/gpu/drm/i915/display/intel_display.h b/drivers/gpu/drm/i915/display/intel_display.h
index a241007f5c8271435cb42db99db89bc3abe1042f..5c3bd1b4d9c95f6e32e0a1dc9a65b490dd4bae3f 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display.h
+++ b/drivers/gpu/drm/i915/display/intel_display.h
@@ -27,7 +27,6 @@
 
 #include <drm/drm_util.h>
 
-enum link_m_n_set;
 enum drm_scaling_filter;
 struct dpll;
 struct drm_connector;
@@ -607,8 +606,9 @@ void intel_display_prepare_reset(struct drm_i915_private *dev_priv);
 void intel_display_finish_reset(struct drm_i915_private *dev_priv);
 void intel_dp_get_m_n(struct intel_crtc *crtc,
                      struct intel_crtc_state *pipe_config);
-void intel_dp_set_m_n(const struct intel_crtc_state *crtc_state,
-                     enum link_m_n_set m_n);
+void intel_cpu_transcoder_set_m_n(const struct intel_crtc_state *crtc_state,
+                                 const struct intel_link_m_n *m_n,
+                                 const struct intel_link_m_n *m2_n2);
 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,

diff --git a/drivers/gpu/drm/i915/display/intel_display_types.h b/drivers/gpu/drm/i915/display/intel_display_types.h
index e83cb799427b682650954f921e8bbde48c507db3..15b13939d57269903b8f96b90199877b60796f8c 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display_types.h
+++ b/drivers/gpu/drm/i915/display/intel_display_types.h
@@ -1445,25 +1445,6 @@ struct intel_hdmi {
 };
 
 struct intel_dp_mst_encoder;
-/*
- * enum link_m_n_set:
- *     When platform provides two set of M_N registers for dp, we can
- *     program them and switch between them incase of DRRS.
- *     But When only one such register is provided, we have to program the
- *     required divider value on that registers itself based on the DRRS state.
- *
- * M1_N1       : Program dp_m_n on M1_N1 registers
- *                       dp_m2_n2 on M2_N2 registers (If supported)
- *
- * M2_N2       : Program dp_m2_n2 on M1_N1 registers
- *                       M2_N2 registers are not supported
- */
-
-enum link_m_n_set {
-       /* Sets the m1_n1 and m2_n2 */
-       M1_N1 = 0,
-       M2_N2
-};
 
 struct intel_dp_compliance_data {
        unsigned long edid;

diff --git a/drivers/gpu/drm/i915/display/intel_dp_mst.c b/drivers/gpu/drm/i915/display/intel_dp_mst.c
index b8bc7d397c81789e47855488c9e7246a94768ea4..7031bd7868227c995d37a06e8bd8a78aaf051912 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_dp_mst.c
+++ b/drivers/gpu/drm/i915/display/intel_dp_mst.c
@@ -523,7 +523,9 @@ static void intel_mst_pre_enable_dp(struct intel_atomic_state *state,
 
        intel_ddi_set_dp_msa(pipe_config, conn_state);
 
-       intel_dp_set_m_n(pipe_config, M1_N1);
+       intel_cpu_transcoder_set_m_n(pipe_config,
+                                    &pipe_config->dp_m_n,
+                                    &pipe_config->dp_m2_n2);
 }
 
 static void intel_mst_enable_dp(struct intel_atomic_state *state,

diff --git a/drivers/gpu/drm/i915/display/intel_drrs.c b/drivers/gpu/drm/i915/display/intel_drrs.c
index 0cacdb174fd0d4f52eef03a588db2ff6cdf2871e..c978badbc82f22966b7a9199a1be3c0c9a2e7439 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_drrs.c
+++ b/drivers/gpu/drm/i915/display/intel_drrs.c
@@ -115,8 +115,9 @@ static void
 intel_drrs_set_refresh_rate_m_n(const struct intel_crtc_state *crtc_state,
                                enum drrs_refresh_rate_type refresh_type)
 {
-       intel_dp_set_m_n(crtc_state,
-                        refresh_type == DRRS_LOW_RR ? M2_N2 : M1_N1);
+       intel_cpu_transcoder_set_m_n(crtc_state, refresh_type == DRRS_LOW_RR ?
+                                    &crtc_state->dp_m2_n2 : &crtc_state->dp_m_n,
+                                    NULL);
 }
 
 static void intel_drrs_set_state(struct drm_i915_private *dev_priv,