From f8a75153b79872741ba70cae94d9d24e1a607def Mon Sep 17 00:00:00 2001 From: Rajkumar Subbiah Date: Wed, 14 Oct 2020 15:37:57 -0400 Subject: [PATCH] disp: msm: dp: send hpd notification before updating mst_active When processing mst hpd low, the driver is clearing mst_active before triggering hpd notification. The hpd notifier is common for both sst and mst and since mst_active is cleared it incorrectly treats this as sst unplug. This change switches the order of these operations to trigger hpd notification before clearing mst_active. Change-Id: I28f90da699e4f2fe177a4e4cfd1d9f03957c3176 Signed-off-by: Rajkumar Subbiah --- msm/dp/dp_display.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/msm/dp/dp_display.c b/msm/dp/dp_display.c index 471a53c9b7..6e528c8ff9 100644 --- a/msm/dp/dp_display.c +++ b/msm/dp/dp_display.c @@ -1250,12 +1250,12 @@ static void dp_display_process_mst_hpd_low(struct dp_display_private *dp) if (dp->mst.cbs.hpd) dp->mst.cbs.hpd(&dp->dp_display, false); - dp_display_update_mst_state(dp, false); - if ((dp_display_state_is(DP_STATE_CONNECT_NOTIFIED) || dp_display_state_is(DP_STATE_ENABLED))) rc = dp_display_send_hpd_notification(dp); + dp_display_update_mst_state(dp, false); + if (dp->mst.cbs.set_mgr_state) { info.mst_protocol = dp->parser->has_mst_sideband; dp->mst.cbs.set_mgr_state(&dp->dp_display, false,