evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "msm: mdss: dp: fix no display issue on second connection"

Browse source
This commit is contained in:
Linux Build Service Account 2017-06-23 05:56:55 -07:00 • committed by Gerrit - the friendly Code Review server
commit a2aa60c24e
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
drivers/platform/msm/msm_ext_display.c
View file

@ -221,6 +221,11 @@ static int msm_ext_disp_process_display(struct msm_ext_disp *ext_disp,
goto end; 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); ret = msm_ext_disp_send_cable_notification(ext_disp, state);
/* positive ret value means audio node was switched */ /* 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) if (ext_disp->current_disp != type)
return false; return false;
end: end:
ext_disp->current_disp = type;
return true; 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_process_audio(ext_disp, type, state, flags);
msm_ext_disp_update_audio_ops(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); 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, pr_debug("Hpd (%d) for display (%s)\n", state,