1 files changed, 7 insertions, 1 deletions

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);