diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
index 2d42d09..bbbe7c7 100644
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@ -2485,8 +2485,18 @@ void intel_dp_sink_dpms(struct intel_dp *intel_dp, int mode)
                return;

        if (mode != DRM_MODE_DPMS_ON) {
-               ret = drm_dp_dpcd_writeb(&intel_dp->aux, DP_SET_POWER,
-                                        DP_SET_POWER_D3);
+
+               /*
+                * Thinkpad MST dock + Dell MST monitor (with a built-in branch) fails to wake
+                * up if the AUX block is powered down.
+                */
+               if (intel_dp->is_mst)
+                       ret = drm_dp_dpcd_writeb(&intel_dp->aux, DP_SET_POWER,
+                                        DP_SET_POWER_D3_AUX_ON);
+               else
+                       ret = drm_dp_dpcd_writeb(&intel_dp->aux, DP_SET_POWER,
+                                                DP_SET_POWER_D3);
+
        } else {
                struct intel_lspcon *lspcon = dp_to_lspcon(intel_dp);

diff --git a/drivers/gpu/drm/i915/intel_dp_mst.c b/drivers/gpu/drm/i915/intel_dp_mst.c
index e4ea968..4d70809 100644
--- a/drivers/gpu/drm/i915/intel_dp_mst.c
+++ b/drivers/gpu/drm/i915/intel_dp_mst.c
@@ -500,6 +500,7 @@ static void intel_dp_destroy_mst_connector(struct drm_dp_mst_topology_mgr *mgr,
                                                   connector);
        /* prevent race with the check in ->detect */
        drm_modeset_lock(&connector->dev->mode_config.connection_mutex, NULL);
+       connector->status = connector_status_disconnected;
        intel_connector->mst_port = NULL;
        drm_modeset_unlock(&connector->dev->mode_config.connection_mutex);

diff --git a/include/drm/drm_dp_helper.h b/include/drm/drm_dp_helper.h
index b17476a..e4f5542 100644
--- a/include/drm/drm_dp_helper.h
+++ b/include/drm/drm_dp_helper.h
@@ -618,6 +618,7 @@
 # define DP_SET_POWER_D0                    0x1
 # define DP_SET_POWER_D3                    0x2
 # define DP_SET_POWER_MASK                  0x3
+# define DP_SET_POWER_D3_AUX_ON                    0x5

 #define DP_EDP_DPCD_REV                            0x700    /* eDP 1.2 */
 # define DP_EDP_11                         0x00