| Message ID | 20210128021753.2560931-1-judyhsiao@google.com |
|---|---|
| State | New |
| Headers | show |
| Series | drm/msm/dp: trigger unplug event in msm_dp_display_disable | expand |
Hello: This patch was applied to qcom/linux.git (refs/heads/for-next): On Thu, 28 Jan 2021 10:17:53 +0800 you wrote: > 1. Trigger the unplug event in msm_dp_display_disable() to shutdown > audio properly. > 2. Reset the completion before signal the disconnect event. > > Signed-off-by: Judy Hsiao <judyhsiao@chromium.org> > --- > drivers/gpu/drm/msm/dp/dp_display.c | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) Here is the summary with links: - drm/msm/dp: trigger unplug event in msm_dp_display_disable https://git.kernel.org/qcom/c/c703d5789590 You are awesome, thank you! -- Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html
diff --git a/drivers/gpu/drm/msm/dp/dp_display.c b/drivers/gpu/drm/msm/dp/dp_display.c index 3bc7ed21de286..81f6794a25100 100644 --- a/drivers/gpu/drm/msm/dp/dp_display.c +++ b/drivers/gpu/drm/msm/dp/dp_display.c @@ -651,8 +651,8 @@ static int dp_hpd_unplug_handle(struct dp_display_private *dp, u32 data) dp_add_event(dp, EV_DISCONNECT_PENDING_TIMEOUT, 0, DP_TIMEOUT_5_SECOND); /* signal the disconnect event early to ensure proper teardown */ - dp_display_handle_plugged_change(g_dp_display, false); reinit_completion(&dp->audio_comp); + dp_display_handle_plugged_change(g_dp_display, false); dp_catalog_hpd_config_intr(dp->catalog, DP_DP_HPD_PLUG_INT_MASK | DP_DP_IRQ_HPD_INT_MASK, true); @@ -890,6 +890,9 @@ static int dp_display_disable(struct dp_display_private *dp, u32 data) /* wait only if audio was enabled */ if (dp_display->audio_enabled) { + /* signal the disconnect event */ + reinit_completion(&dp->audio_comp); + dp_display_handle_plugged_change(dp_display, false); if (!wait_for_completion_timeout(&dp->audio_comp, HZ * 5)) DRM_ERROR("audio comp timeout\n");
1. Trigger the unplug event in msm_dp_display_disable() to shutdown audio properly. 2. Reset the completion before signal the disconnect event. Signed-off-by: Judy Hsiao <judyhsiao@chromium.org> --- drivers/gpu/drm/msm/dp/dp_display.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)