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

Merge "msm: mdss: dp: fix watchdog reset with DP connected in AOD mode"

Browse source
This commit is contained in:
Linux Build Service Account 2017-07-19 09:10:27 -07:00 • committed by Gerrit - the friendly Code Review server
commit 42029fbe8c
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
drivers/video/fbdev/msm/mdss_dp.c
View file

@ -3982,12 +3982,6 @@ static int mdss_dp_process_hpd_irq_high(struct mdss_dp_drv_pdata *dp)
{
int ret = 0;
/* In case of HPD_IRQ events without DP link being turned on such as
* adb shell stop, skip handling hpd_irq event.
*/
if (!dp->dp_initialized)
goto exit;
pr_debug("start\n");
dp->hpd_irq_on = true;
@ -4103,6 +4097,15 @@ static void mdss_dp_process_attention(struct mdss_dp_drv_pdata *dp_drv)
if (dp_drv->alt_mode.dp_status.hpd_irq) {
pr_debug("Attention: hpd_irq high\n");
/* In case of HPD_IRQ events without DP link being
* turned on such as adb shell stop, skip handling
* hpd_irq event.
*/
if (!dp_drv->dp_initialized) {
pr_err("DP not initialized yet\n");
return;
}
if (dp_is_hdcp_enabled(dp_drv) && dp_drv->hdcp.ops->cp_irq) {
if (!dp_drv->hdcp.ops->cp_irq(dp_drv->hdcp.data))
return;