2 files changed, 13 insertions, 3 deletions

diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c
index a6672a9abd85..92cb26b18a9b 100644
--- a/drivers/gpu/drm/i915/intel_ddi.c
+++ b/drivers/gpu/drm/i915/intel_ddi.c
@@ -2324,7 +2324,8 @@ static void intel_ddi_pre_enable_dp(struct intel_encoder *encoder,
                 intel_prepare_dp_ddi_buffers(encoder, crtc_state);
 
         intel_ddi_init_dp_buf_reg(encoder);
-        intel_dp_sink_dpms(intel_dp, DRM_MODE_DPMS_ON);
+        if (!is_mst)
+                intel_dp_sink_dpms(intel_dp, DRM_MODE_DPMS_ON);
         intel_dp_start_link_train(intel_dp);
         if (port != PORT_A || INTEL_GEN(dev_priv) >= 9)
                 intel_dp_stop_link_train(intel_dp);
@@ -2422,12 +2423,15 @@ static void intel_ddi_post_disable_dp(struct intel_encoder *encoder,
         struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
         struct intel_digital_port *dig_port = enc_to_dig_port(&encoder->base);
         struct intel_dp *intel_dp = &dig_port->dp;
+        bool is_mst = intel_crtc_has_type(old_crtc_state,
+                                          INTEL_OUTPUT_DP_MST);
 
         /*
          * Power down sink before disabling the port, otherwise we end
          * up getting interrupts from the sink on detecting link loss.
          */
-        intel_dp_sink_dpms(intel_dp, DRM_MODE_DPMS_OFF);
+        if (!is_mst)
+                intel_dp_sink_dpms(intel_dp, DRM_MODE_DPMS_OFF);
 
         intel_disable_ddi_buf(encoder);
 
diff --git a/drivers/gpu/drm/i915/intel_dp_mst.c b/drivers/gpu/drm/i915/intel_dp_mst.c
index c3de0918ee13..9e6956c08688 100644
--- a/drivers/gpu/drm/i915/intel_dp_mst.c
+++ b/drivers/gpu/drm/i915/intel_dp_mst.c
@@ -180,9 +180,11 @@ 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_dp_sink_dpms(intel_dp, DRM_MODE_DPMS_OFF);
                 intel_dig_port->base.post_disable(&intel_dig_port->base,
                                                   old_crtc_state, NULL);
+        }
 
         DRM_DEBUG_KMS("active links %d\n", intel_dp->active_mst_links);
 }
@@ -223,7 +225,11 @@ static void intel_mst_pre_enable_dp(struct intel_encoder *encoder,
 
         DRM_DEBUG_KMS("active links %d\n", intel_dp->active_mst_links);
 
+        if (intel_dp->active_mst_links == 0)
+                intel_dp_sink_dpms(intel_dp, DRM_MODE_DPMS_ON);
+
         drm_dp_send_power_updown_phy(&intel_dp->mst_mgr, connector->port, true);
+
         if (intel_dp->active_mst_links == 0)
                 intel_dig_port->base.pre_enable(&intel_dig_port->base,
                                                 pipe_config, NULL);