@@ -5849,8 +5849,13 @@ intel_dp_detect(struct drm_connector *connector,
/* Can't disconnect eDP */
if (intel_dp_is_edp(intel_dp))
status = edp_detect(intel_dp);
- else if (intel_digital_port_connected(encoder))
+ else if (intel_digital_port_connected(encoder)) {
status = intel_dp_detect_dpcd(intel_dp);
+ if (status == connector_status_connected && intel_dp->is_mst &&
+ !intel_dp_mst_link_status(intel_dp))
+ if (intel_dp_retrain_link(encoder, ctx))
+ status = connector_status_disconnected;
+ }
else
status = connector_status_disconnected;