drm/i915: Extract {i9xx,ilk}_configure_cpu_transcoder()

Follow the path laid out by hsw+ and extract helpers to configure
the cpu transcoder for earlier platforms as well.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220128103757.22461-10-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 7eeea9295199f6a125af5e8af0fd5ba63b615002..76c6ccfce56bd87b2bc5ab3bfe0745603147d9cc 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -1808,13 +1808,32 @@ static void intel_disable_primary_plane(const struct intel_crtc_state *crtc_stat
        plane->disable_arm(plane, crtc_state);
 }
 
+static void ilk_configure_cpu_transcoder(const struct intel_crtc_state *crtc_state)
+{
+       struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc);
+       enum transcoder cpu_transcoder = crtc_state->cpu_transcoder;
+
+       if (crtc_state->has_pch_encoder) {
+               intel_cpu_transcoder_set_m1_n1(crtc, cpu_transcoder,
+                                              &crtc_state->fdi_m_n);
+       } else if (intel_crtc_has_dp_encoder(crtc_state)) {
+               intel_cpu_transcoder_set_m1_n1(crtc, cpu_transcoder,
+                                              &crtc_state->dp_m_n);
+               intel_cpu_transcoder_set_m2_n2(crtc, cpu_transcoder,
+                                              &crtc_state->dp_m2_n2);
+       }
+
+       intel_set_transcoder_timings(crtc_state);
+
+       ilk_set_pipeconf(crtc_state);
+}
+
 static void ilk_crtc_enable(struct intel_atomic_state *state,
                            struct intel_crtc *crtc)
 {
        const struct intel_crtc_state *new_crtc_state =
                intel_atomic_get_new_crtc_state(state, crtc);
        struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
-       enum transcoder cpu_transcoder = new_crtc_state->cpu_transcoder;
        enum pipe pipe = crtc->pipe;
 
        if (drm_WARN_ON(&dev_priv->drm, crtc->active))
@@ -1833,21 +1852,10 @@ 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 (new_crtc_state->has_pch_encoder) {
-               intel_cpu_transcoder_set_m1_n1(crtc, cpu_transcoder,
-                                              &new_crtc_state->fdi_m_n);
-       } else if (intel_crtc_has_dp_encoder(new_crtc_state)) {
-               intel_cpu_transcoder_set_m1_n1(crtc, cpu_transcoder,
-                                              &new_crtc_state->dp_m_n);
-               intel_cpu_transcoder_set_m2_n2(crtc, cpu_transcoder,
-                                              &new_crtc_state->dp_m2_n2);
-       }
+       ilk_configure_cpu_transcoder(new_crtc_state);
 
-       intel_set_transcoder_timings(new_crtc_state);
        intel_set_pipe_src_size(new_crtc_state);
 
-       ilk_set_pipeconf(new_crtc_state);
-
        crtc->active = true;
 
        intel_encoders_pre_enable(state, crtc);
@@ -2445,26 +2453,36 @@ static void modeset_put_crtc_power_domains(struct intel_crtc *crtc,
                                            domains);
 }
 
+static void i9xx_configure_cpu_transcoder(const struct intel_crtc_state *crtc_state)
+{
+       struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc);
+       enum transcoder cpu_transcoder = crtc_state->cpu_transcoder;
+
+       if (intel_crtc_has_dp_encoder(crtc_state)) {
+               intel_cpu_transcoder_set_m1_n1(crtc, cpu_transcoder,
+                                              &crtc_state->dp_m_n);
+               intel_cpu_transcoder_set_m2_n2(crtc, cpu_transcoder,
+                                              &crtc_state->dp_m2_n2);
+       }
+
+       intel_set_transcoder_timings(crtc_state);
+
+       i9xx_set_pipeconf(crtc_state);
+}
+
 static void valleyview_crtc_enable(struct intel_atomic_state *state,
                                   struct intel_crtc *crtc)
 {
        const struct intel_crtc_state *new_crtc_state =
                intel_atomic_get_new_crtc_state(state, crtc);
        struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
-       enum transcoder cpu_transcoder = new_crtc_state->cpu_transcoder;
        enum pipe pipe = crtc->pipe;
 
        if (drm_WARN_ON(&dev_priv->drm, crtc->active))
                return;
 
-       if (intel_crtc_has_dp_encoder(new_crtc_state)) {
-               intel_cpu_transcoder_set_m1_n1(crtc, cpu_transcoder,
-                                              &new_crtc_state->dp_m_n);
-               intel_cpu_transcoder_set_m2_n2(crtc, cpu_transcoder,
-                                              &new_crtc_state->dp_m2_n2);
-       }
+       i9xx_configure_cpu_transcoder(new_crtc_state);
 
-       intel_set_transcoder_timings(new_crtc_state);
        intel_set_pipe_src_size(new_crtc_state);
 
        if (IS_CHERRYVIEW(dev_priv) && pipe == PIPE_B) {
@@ -2472,8 +2490,6 @@ static void valleyview_crtc_enable(struct intel_atomic_state *state,
                intel_de_write(dev_priv, CHV_CANVAS(pipe), 0);
        }
 
-       i9xx_set_pipeconf(new_crtc_state);
-
        crtc->active = true;
 
        intel_set_cpu_fifo_underrun_reporting(dev_priv, pipe, true);
@@ -2508,24 +2524,15 @@ static void i9xx_crtc_enable(struct intel_atomic_state *state,
        const struct intel_crtc_state *new_crtc_state =
                intel_atomic_get_new_crtc_state(state, crtc);
        struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
-       enum transcoder cpu_transcoder = new_crtc_state->cpu_transcoder;
        enum pipe pipe = crtc->pipe;
 
        if (drm_WARN_ON(&dev_priv->drm, crtc->active))
                return;
 
-       if (intel_crtc_has_dp_encoder(new_crtc_state)) {
-               intel_cpu_transcoder_set_m1_n1(crtc, cpu_transcoder,
-                                              &new_crtc_state->dp_m_n);
-               intel_cpu_transcoder_set_m2_n2(crtc, cpu_transcoder,
-                                              &new_crtc_state->dp_m2_n2);
-       }
+       i9xx_configure_cpu_transcoder(new_crtc_state);
 
-       intel_set_transcoder_timings(new_crtc_state);
        intel_set_pipe_src_size(new_crtc_state);
 
-       i9xx_set_pipeconf(new_crtc_state);
-
        crtc->active = true;
 
        if (DISPLAY_VER(dev_priv) != 2)