1 files changed, 7 insertions, 7 deletions

diff --git a/drivers/gpu/drm/i915/intel_dp_mst.c b/drivers/gpu/drm/i915/intel_dp_mst.c
index 7e3e01607643..77920f1a3da1 100644
--- a/drivers/gpu/drm/i915/intel_dp_mst.c
+++ b/drivers/gpu/drm/i915/intel_dp_mst.c
@@ -166,6 +166,8 @@ static void intel_mst_post_disable_dp(struct intel_encoder *encoder,
         struct intel_connector *connector =
                 to_intel_connector(old_conn_state->connector);
 
+        intel_ddi_disable_pipe_clock(old_crtc_state);
+
         /* this can fail */
         drm_dp_check_act_status(&intel_dp->mst_mgr);
         /* and this can also fail */
@@ -241,17 +243,16 @@ static void intel_mst_pre_enable_dp(struct intel_encoder *encoder,
                                        connector->port,
                                        pipe_config->pbn,
                                        pipe_config->dp_m_n.tu);
-        if (ret == false) {
+        if (!ret)
                 DRM_ERROR("failed to allocate vcpi\n");
-                return;
-        }
-
 
         intel_dp->active_mst_links++;
         temp = I915_READ(DP_TP_STATUS(port));
         I915_WRITE(DP_TP_STATUS(port), temp);
 
         ret = drm_dp_update_payload_part1(&intel_dp->mst_mgr);
+
+        intel_ddi_enable_pipe_clock(pipe_config);
 }
 
 static void intel_mst_enable_dp(struct intel_encoder *encoder,
@@ -263,7 +264,6 @@ static void intel_mst_enable_dp(struct intel_encoder *encoder,
         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->base.port;
-        int ret;
 
         DRM_DEBUG_KMS("active links %d\n", intel_dp->active_mst_links);
 
@@ -274,9 +274,9 @@ static void intel_mst_enable_dp(struct intel_encoder *encoder,
                                     1))
                 DRM_ERROR("Timed out waiting for ACT sent\n");
 
-        ret = drm_dp_check_act_status(&intel_dp->mst_mgr);
+        drm_dp_check_act_status(&intel_dp->mst_mgr);
 
-        ret = drm_dp_update_payload_part2(&intel_dp->mst_mgr);
+        drm_dp_update_payload_part2(&intel_dp->mst_mgr);
         if (pipe_config->has_audio)
                 intel_audio_codec_enable(encoder, pipe_config, conn_state);
 }