From 76051760624d4b5fbfae046246d4b7a851c2ed1b Mon Sep 17 00:00:00 2001 From: "Zhao, Yuan" Date: Tue, 8 Sep 2020 16:58:35 +0800 Subject: [PATCH] disp: msm: dp: do not skip disconnect when host is unready usbpd_attention_cb will do dp_display_disconnect_sync, but will not deinit dp host. usbpd_disconnect_cb can deinit dp host, so need to check dp state, if dp is unready, should not skip usbpd_disconnect, can deinit dp host now. Change-Id: I5a149923ecb043b3a7db973e092bd0d49a715981 Signed-off-by: Zhao, Yuan --- msm/dp/dp_display.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/msm/dp/dp_display.c b/msm/dp/dp_display.c index caeba8da53..436c4c98a2 100644 --- a/msm/dp/dp_display.c +++ b/msm/dp/dp_display.c @@ -1358,7 +1358,8 @@ static int dp_display_usbpd_disconnect_cb(struct device *dev) dp->debug->psm_enabled); /* skip if a disconnect is already in progress */ - if (dp_display_state_is(DP_STATE_ABORTED)) { + if (dp_display_state_is(DP_STATE_ABORTED) && + dp_display_state_is(DP_STATE_READY)) { DP_DEBUG("disconnect already in progress\n"); SDE_EVT32_EXTERNAL(SDE_EVTLOG_FUNC_CASE1, dp->state); return 0;