diff options
| author | Linux Build Service Account <lnxbuild@quicinc.com> | 2017-06-23 05:56:55 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-06-23 05:56:55 -0700 |
| commit | a2aa60c24e69e387c056656e4b01be598a96e506 (patch) | |
| tree | 84ef51e757cb153723859acbb3561b7f7ed3bf7c | |
| parent | b85e238432e766512a8da1bfd91615f2d8204fa0 (diff) | |
| parent | 525ccbacb28d2bf9ca3f0ec7053c17760934ffe5 (diff) | |
Merge "msm: mdss: dp: fix no display issue on second connection"
| -rw-r--r-- | drivers/platform/msm/msm_ext_display.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/platform/msm/msm_ext_display.c b/drivers/platform/msm/msm_ext_display.c index 53c85773b377..4f7d27db8dee 100644 --- a/drivers/platform/msm/msm_ext_display.c +++ b/drivers/platform/msm/msm_ext_display.c @@ -221,6 +221,11 @@ static int msm_ext_disp_process_display(struct msm_ext_disp *ext_disp, goto end; } + if (state == EXT_DISPLAY_CABLE_CONNECT) + ext_disp->current_disp = type; + else + ext_disp->current_disp = EXT_DISPLAY_TYPE_MAX; + ret = msm_ext_disp_send_cable_notification(ext_disp, state); /* positive ret value means audio node was switched */ @@ -287,7 +292,6 @@ static bool msm_ext_disp_validate_connect(struct msm_ext_disp *ext_disp, if (ext_disp->current_disp != type) return false; end: - ext_disp->current_disp = type; return true; } @@ -369,8 +373,6 @@ static int msm_ext_disp_hpd(struct platform_device *pdev, msm_ext_disp_process_audio(ext_disp, type, state, flags); msm_ext_disp_update_audio_ops(ext_disp, type, state, flags); msm_ext_disp_process_display(ext_disp, type, state, flags); - - ext_disp->current_disp = EXT_DISPLAY_TYPE_MAX; } pr_debug("Hpd (%d) for display (%s)\n", state, |