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

Merge "msm: mdss: hdmi: fix HDCP1.4 authentication issues"

Browse source
This commit is contained in:
Linux Build Service Account 2018-03-15 05:43:07 -07:00 • committed by Gerrit - the friendly Code Review server
commit 8bf0f8bd22
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
drivers/video/fbdev/msm/mdss_hdcp_1x.c
View file

@ -1349,8 +1349,10 @@ static int hdcp_1x_authentication_part2(struct hdcp_1x *hdcp)
goto error; goto error;
/* do not proceed further if no device connected */ /* do not proceed further if no device connected */
if (!hdcp->current_tp.dev_count) if (!hdcp->current_tp.dev_count) {
rc = -EINVAL;
goto error; goto error;
}
rc = hdcp_1x_write_ksv_fifo(hdcp); rc = hdcp_1x_write_ksv_fifo(hdcp);
} while (--v_retry && rc); } while (--v_retry && rc);
@ -1457,7 +1459,7 @@ static void hdcp_1x_auth_work(struct work_struct *work)
goto end; goto end;
} else { } else {
hdcp->hdcp_state = HDCP_STATE_AUTHENTICATED; hdcp->hdcp_state = HDCP_STATE_AUTHENTICATED;
goto end; goto disable_sw_ddc;
} }
hdcp->ksv_ready = false; hdcp->ksv_ready = false;
@ -1466,6 +1468,7 @@ static void hdcp_1x_auth_work(struct work_struct *work)
if (rc) if (rc)
goto end; goto end;
disable_sw_ddc:
/* /*
* Disabling software DDC before going into part3 to make sure * Disabling software DDC before going into part3 to make sure
* there is no Arbitration between software and hardware for DDC * there is no Arbitration between software and hardware for DDC