1 files changed, 31 insertions, 48 deletions

diff --git a/drivers/gpu/drm/i915/intel_dp_mst.c b/drivers/gpu/drm/i915/intel_dp_mst.c
index 772521440a9f..c3de0918ee13 100644
--- a/drivers/gpu/drm/i915/intel_dp_mst.c
+++ b/drivers/gpu/drm/i915/intel_dp_mst.c
@@ -34,6 +34,7 @@ static bool intel_dp_mst_compute_config(struct intel_encoder *encoder,
                                         struct intel_crtc_state *pipe_config,
                                         struct drm_connector_state *conn_state)
 {
+        struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
         struct intel_dp_mst_encoder *intel_mst = enc_to_mst(&encoder->base);
         struct intel_digital_port *intel_dig_port = intel_mst->primary;
         struct intel_dp *intel_dp = &intel_dig_port->dp;
@@ -87,6 +88,12 @@ static bool intel_dp_mst_compute_config(struct intel_encoder *encoder,
 
         pipe_config->dp_m_n.tu = slots;
 
+        if (IS_GEN9_LP(dev_priv))
+                pipe_config->lane_lat_optim_mask =
+                        bxt_ddi_phy_calc_lane_lat_optim_mask(pipe_config->lane_count);
+
+        intel_ddi_compute_min_voltage_level(dev_priv, pipe_config);
+
         return true;
 }
 
@@ -142,7 +149,8 @@ static void intel_mst_disable_dp(struct intel_encoder *encoder,
                 DRM_ERROR("failed to update payload %d\n", ret);
         }
         if (old_crtc_state->has_audio)
-                intel_audio_codec_disable(encoder);
+                intel_audio_codec_disable(encoder,
+                                          old_crtc_state, old_conn_state);
 }
 
 static void intel_mst_post_disable_dp(struct intel_encoder *encoder,
@@ -172,13 +180,27 @@ static void intel_mst_post_disable_dp(struct intel_encoder *encoder,
         intel_dp->active_mst_links--;
 
         intel_mst->connector = NULL;
-        if (intel_dp->active_mst_links == 0) {
+        if (intel_dp->active_mst_links == 0)
                 intel_dig_port->base.post_disable(&intel_dig_port->base,
-                                                  NULL, NULL);
-        }
+                                                  old_crtc_state, NULL);
+
         DRM_DEBUG_KMS("active links %d\n", intel_dp->active_mst_links);
 }
 
+static void intel_mst_pre_pll_enable_dp(struct intel_encoder *encoder,
+                                        const struct intel_crtc_state *pipe_config,
+                                        const struct drm_connector_state *conn_state)
+{
+        struct intel_dp_mst_encoder *intel_mst = enc_to_mst(&encoder->base);
+        struct intel_digital_port *intel_dig_port = intel_mst->primary;
+        struct intel_dp *intel_dp = &intel_dig_port->dp;
+
+        if (intel_dp->active_mst_links == 0 &&
+            intel_dig_port->base.pre_pll_enable)
+                intel_dig_port->base.pre_pll_enable(&intel_dig_port->base,
+                                                    pipe_config, NULL);
+}
+
 static void intel_mst_pre_enable_dp(struct intel_encoder *encoder,
                                     const struct intel_crtc_state *pipe_config,
                                     const struct drm_connector_state *conn_state)
@@ -187,7 +209,7 @@ static void intel_mst_pre_enable_dp(struct intel_encoder *encoder,
         struct intel_digital_port *intel_dig_port = intel_mst->primary;
         struct intel_dp *intel_dp = &intel_dig_port->dp;
         struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
-        enum port port = intel_dig_port->port;
+        enum port port = intel_dig_port->base.port;
         struct intel_connector *connector =
                 to_intel_connector(conn_state->connector);
         int ret;
@@ -231,7 +253,7 @@ static void intel_mst_enable_dp(struct intel_encoder *encoder,
         struct intel_digital_port *intel_dig_port = intel_mst->primary;
         struct intel_dp *intel_dp = &intel_dig_port->dp;
         struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
-        enum port port = intel_dig_port->port;
+        enum port port = intel_dig_port->base.port;
         int ret;
 
         DRM_DEBUG_KMS("active links %d\n", intel_dp->active_mst_links);
@@ -265,48 +287,8 @@ static void intel_dp_mst_enc_get_config(struct intel_encoder *encoder,
 {
         struct intel_dp_mst_encoder *intel_mst = enc_to_mst(&encoder->base);
         struct intel_digital_port *intel_dig_port = intel_mst->primary;
-        struct intel_crtc *crtc = to_intel_crtc(pipe_config->base.crtc);
-        struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
-        enum transcoder cpu_transcoder = pipe_config->cpu_transcoder;
-        u32 temp, flags = 0;
-
-        pipe_config->has_audio =
-                intel_ddi_is_audio_enabled(dev_priv, crtc);
-
-        temp = I915_READ(TRANS_DDI_FUNC_CTL(cpu_transcoder));
-        if (temp & TRANS_DDI_PHSYNC)
-                flags |= DRM_MODE_FLAG_PHSYNC;
-        else
-                flags |= DRM_MODE_FLAG_NHSYNC;
-        if (temp & TRANS_DDI_PVSYNC)
-                flags |= DRM_MODE_FLAG_PVSYNC;
-        else
-                flags |= DRM_MODE_FLAG_NVSYNC;
-
-        switch (temp & TRANS_DDI_BPC_MASK) {
-        case TRANS_DDI_BPC_6:
-                pipe_config->pipe_bpp = 18;
-                break;
-        case TRANS_DDI_BPC_8:
-                pipe_config->pipe_bpp = 24;
-                break;
-        case TRANS_DDI_BPC_10:
-                pipe_config->pipe_bpp = 30;
-                break;
-        case TRANS_DDI_BPC_12:
-                pipe_config->pipe_bpp = 36;
-                break;
-        default:
-                break;
-        }
-        pipe_config->base.adjusted_mode.flags |= flags;
-
-        pipe_config->lane_count =
-                ((temp & DDI_PORT_WIDTH_MASK) >> DDI_PORT_WIDTH_SHIFT) + 1;
-
-        intel_dp_get_m_n(crtc, pipe_config);
 
-        intel_ddi_clock_get(&intel_dig_port->base, pipe_config);
+        intel_ddi_get_config(&intel_dig_port->base, pipe_config);
 }
 
 static int intel_dp_mst_get_ddc_modes(struct drm_connector *connector)
@@ -570,13 +552,14 @@ intel_dp_create_fake_mst_encoder(struct intel_digital_port *intel_dig_port, enum
 
         intel_encoder->type = INTEL_OUTPUT_DP_MST;
         intel_encoder->power_domain = intel_dig_port->base.power_domain;
-        intel_encoder->port = intel_dig_port->port;
+        intel_encoder->port = intel_dig_port->base.port;
         intel_encoder->crtc_mask = 0x7;
         intel_encoder->cloneable = 0;
 
         intel_encoder->compute_config = intel_dp_mst_compute_config;
         intel_encoder->disable = intel_mst_disable_dp;
         intel_encoder->post_disable = intel_mst_post_disable_dp;
+        intel_encoder->pre_pll_enable = intel_mst_pre_pll_enable_dp;
         intel_encoder->pre_enable = intel_mst_pre_enable_dp;
         intel_encoder->enable = intel_mst_enable_dp;
         intel_encoder->get_hw_state = intel_dp_mst_enc_get_hw_state;