Merge "disp: msm: dp: remove disconnect call for downstream port status change" into display-kernel.lnx.5.15.r1-rel

This commit is contained in:
Linux Build Service Account
2022-08-24 10:42:18 -07:00
committed by Gerrit - the friendly Code Review server

View File

@@ -1762,15 +1762,16 @@ static void dp_display_attention_work(struct work_struct *work)
if (dp->link->sink_request & DS_PORT_STATUS_CHANGED) { if (dp->link->sink_request & DS_PORT_STATUS_CHANGED) {
SDE_EVT32_EXTERNAL(dp->state, DS_PORT_STATUS_CHANGED); SDE_EVT32_EXTERNAL(dp->state, DS_PORT_STATUS_CHANGED);
if (dp_display_is_sink_count_zero(dp)) { if (!dp->mst.mst_active) {
dp_display_handle_disconnect(dp); if (dp_display_is_sink_count_zero(dp)) {
} else { dp_display_handle_disconnect(dp);
/* } else {
* connect work should take care of sending /*
* the HPD notification. * connect work should take care of sending
*/ * the HPD notification.
if (!dp->mst.mst_active) */
queue_work(dp->wq, &dp->connect_work); queue_work(dp->wq, &dp->connect_work);
}
} }
goto mst_attention; goto mst_attention;