drm/i915: move dp_m_n computation to dp_encoder->compute_config

We need a flag to designate dp encoders and the dp link m_n parameters
in the pipe config for that. And now that the pipe bpp computations
have been moved up and stored in the pipe config, too, we can do this
without losing our sanity.

v2: Rebased on top of Takashi Iwai's fix to (again) fix the target
clock handling for eDP. Luckily the new code is sane enough and just
does the right thing!

v3: Move ->has_dp_encoder to this patch (Jesse).

Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

3 files changed, 28 insertions, 67 deletions

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 06dacca8257c..21d8a20d9920 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -4202,6 +4202,14 @@ static void i9xx_update_pll_dividers(struct drm_crtc *crtc,
         }
 }
 
+static void intel_dp_set_m_n(struct intel_crtc *crtc)
+{
+        if (crtc->config.has_pch_encoder)
+                intel_pch_transcoder_set_m_n(crtc, &crtc->config.dp_m_n);
+        else
+                intel_cpu_transcoder_set_m_n(crtc, &crtc->config.dp_m_n);
+}
+
 static void vlv_update_pll(struct drm_crtc *crtc,
                            intel_clock_t *clock, intel_clock_t *reduced_clock,
                            int num_connectors)
@@ -4209,9 +4217,6 @@ static void vlv_update_pll(struct drm_crtc *crtc,
         struct drm_device *dev = crtc->dev;
         struct drm_i915_private *dev_priv = dev->dev_private;
         struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
-        struct drm_display_mode *adjusted_mode =
-                &intel_crtc->config.adjusted_mode;
-        struct drm_display_mode *mode = &intel_crtc->config.requested_mode;
         int pipe = intel_crtc->pipe;
         u32 dpll, mdiv, pdiv;
         u32 bestn, bestm1, bestm2, bestp1, bestp2;
@@ -4267,8 +4272,8 @@ static void vlv_update_pll(struct drm_crtc *crtc,
 
         intel_dpio_write(dev_priv, DPIO_FASTCLK_DISABLE, 0x620);
 
-        if (intel_pipe_has_type(crtc, INTEL_OUTPUT_DISPLAYPORT))
-                intel_dp_set_m_n(crtc, mode, adjusted_mode);
+        if (intel_crtc->config.has_dp_encoder)
+                intel_dp_set_m_n(intel_crtc);
 
         I915_WRITE(DPLL(pipe), dpll);
 
@@ -4314,9 +4319,6 @@ static void i9xx_update_pll(struct drm_crtc *crtc,
         struct drm_device *dev = crtc->dev;
         struct drm_i915_private *dev_priv = dev->dev_private;
         struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
-        struct drm_display_mode *adjusted_mode =
-                &intel_crtc->config.adjusted_mode;
-        struct drm_display_mode *mode = &intel_crtc->config.requested_mode;
         struct intel_encoder *encoder;
         int pipe = intel_crtc->pipe;
         u32 dpll;
@@ -4391,8 +4393,8 @@ static void i9xx_update_pll(struct drm_crtc *crtc,
                 if (encoder->pre_pll_enable)
                         encoder->pre_pll_enable(encoder);
 
-        if (intel_pipe_has_type(crtc, INTEL_OUTPUT_DISPLAYPORT))
-                intel_dp_set_m_n(crtc, mode, adjusted_mode);
+        if (intel_crtc->config.has_dp_encoder)
+                intel_dp_set_m_n(intel_crtc);
 
         I915_WRITE(DPLL(pipe), dpll);
 
@@ -5647,8 +5649,8 @@ static int ironlake_crtc_mode_set(struct drm_crtc *crtc,
         } else
                 intel_put_pch_pll(intel_crtc);
 
-        if (is_dp)
-                intel_dp_set_m_n(crtc, mode, adjusted_mode);
+        if (intel_crtc->config.has_dp_encoder)
+                intel_dp_set_m_n(intel_crtc);
 
         for_each_encoder_on_crtc(dev, crtc, encoder)
                 if (encoder->pre_pll_enable)
@@ -5797,8 +5799,8 @@ static int haswell_crtc_mode_set(struct drm_crtc *crtc,
         DRM_DEBUG_KMS("Mode for pipe %d:\n", pipe);
         drm_mode_debug_printmodeline(mode);
 
-        if (is_dp)
-                intel_dp_set_m_n(crtc, mode, adjusted_mode);
+        if (intel_crtc->config.has_dp_encoder)
+                intel_dp_set_m_n(intel_crtc);
 
         intel_crtc->lowfreq_avail = false;
 
diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
index 5a209626e9a1..70507081141b 100644
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@ -193,6 +193,8 @@ intel_dp_mode_valid(struct drm_connector *connector,
 
                 if (mode->vdisplay > fixed_mode->vdisplay)
                         return MODE_PANEL;
+
+                target_clock = fixed_mode->clock;
         }
 
         max_link_clock = drm_dp_bw_code_to_link_rate(intel_dp_max_link_bw(intel_dp));
@@ -697,6 +699,8 @@ intel_dp_compute_config(struct intel_encoder *encoder,
         if (HAS_PCH_SPLIT(dev) && !HAS_DDI(dev) && !is_cpu_edp(intel_dp))
                 pipe_config->has_pch_encoder = true;
 
+        pipe_config->has_dp_encoder = true;
+
         if (is_edp(intel_dp) && intel_connector->panel.fixed_mode) {
                 intel_fixed_panel_mode(intel_connector->panel.fixed_mode,
                                        adjusted_mode);
@@ -716,7 +720,7 @@ intel_dp_compute_config(struct intel_encoder *encoder,
 
         /* Walk through all bpp values. Luckily they're all nicely spaced with 2
          * bpc in between. */
-        bpp = 8*3;
+        bpp = min_t(int, 8*3, pipe_config->pipe_bpp);
         if (is_edp(intel_dp) && dev_priv->edp.bpp)
                 bpp = min_t(int, bpp, dev_priv->edp.bpp);
 
@@ -765,56 +769,11 @@ found:
         DRM_DEBUG_KMS("DP link bw required %i available %i\n",
                       mode_rate, link_avail);
 
-        return true;
-}
-
-void
-intel_dp_set_m_n(struct drm_crtc *crtc, struct drm_display_mode *mode,
-                 struct drm_display_mode *adjusted_mode)
-{
-        struct drm_device *dev = crtc->dev;
-        struct intel_encoder *intel_encoder;
-        struct intel_dp *intel_dp;
-        struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
-        int lane_count = 4;
-        struct intel_link_m_n m_n;
-        int target_clock;
-
-        /*
-         * Find the lane count in the intel_encoder private
-         */
-        for_each_encoder_on_crtc(dev, crtc, intel_encoder) {
-                intel_dp = enc_to_intel_dp(&intel_encoder->base);
-
-                if (intel_encoder->type == INTEL_OUTPUT_DISPLAYPORT ||
-                    intel_encoder->type == INTEL_OUTPUT_EDP)
-                {
-                        lane_count = intel_dp->lane_count;
-                        break;
-                }
-        }
-
-        target_clock = mode->clock;
-        for_each_encoder_on_crtc(dev, crtc, intel_encoder) {
-                if (intel_encoder->type == INTEL_OUTPUT_EDP) {
-                        target_clock = intel_edp_target_clock(intel_encoder,
-                                                              mode);
-                        break;
-                }
-        }
-
-        /*
-         * Compute the GMCH and Link ratios. The '3' here is
-         * the number of bytes_per_pixel post-LUT, which we always
-         * set up for 8-bits of R/G/B, or 3 bytes total.
-         */
-        intel_link_compute_m_n(intel_crtc->config.pipe_bpp, lane_count,
-                               target_clock, adjusted_mode->clock, &m_n);
+        intel_link_compute_m_n(bpp, lane_count,
+                               target_clock, adjusted_mode->clock,
+                               &pipe_config->dp_m_n);
 
-        if (intel_crtc->config.has_pch_encoder)
-                intel_pch_transcoder_set_m_n(intel_crtc, &m_n);
-        else
-                intel_cpu_transcoder_set_m_n(intel_crtc, &m_n);
+        return true;
 }
 
 void intel_dp_init_link_config(struct intel_dp *intel_dp)
diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
index c2a7f84b609d..9a20607440e0 100644
--- a/drivers/gpu/drm/i915/intel_drv.h
+++ b/drivers/gpu/drm/i915/intel_drv.h
@@ -190,6 +190,9 @@ struct intel_crtc_config {
          */
         bool limited_color_range;
 
+        /* DP has a bunch of special case unfortunately, so mark the pipe
+         * accordingly. */
+        bool has_dp_encoder;
         bool dither;
         int pipe_bpp;
         struct intel_link_m_n dp_m_n;
@@ -469,9 +472,6 @@ extern void intel_dp_init(struct drm_device *dev, int output_reg,
                           enum port port);
 extern void intel_dp_init_connector(struct intel_digital_port *intel_dig_port,
                                     struct intel_connector *intel_connector);
-void
-intel_dp_set_m_n(struct drm_crtc *crtc, struct drm_display_mode *mode,
-                 struct drm_display_mode *adjusted_mode);
 extern void intel_dp_init_link_config(struct intel_dp *intel_dp);
 extern void intel_dp_start_link_train(struct intel_dp *intel_dp);
 extern void intel_dp_complete_link_train(struct intel_dp *intel_dp);