mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-15 01:01:56 -04:00
Merge "disp: msm: dp: Avoid double authentication if first is still in progress"
This commit is contained in:
commit
f8090586ac
1 changed files with 3 additions and 2 deletions
|
|
@ -344,7 +344,6 @@ static void dp_display_hdcp_cb_work(struct work_struct *work)
|
|||
dp_display_update_hdcp_status(dp, true);
|
||||
return;
|
||||
}
|
||||
status->hdcp_state = HDCP_STATE_AUTHENTICATING;
|
||||
} else {
|
||||
dp_display_update_hdcp_status(dp, true);
|
||||
return;
|
||||
|
|
@ -370,10 +369,12 @@ static void dp_display_hdcp_cb_work(struct work_struct *work)
|
|||
ops->force_encryption(data, dp->debug->force_encryption);
|
||||
|
||||
switch (status->hdcp_state) {
|
||||
case HDCP_STATE_AUTHENTICATING:
|
||||
case HDCP_STATE_INACTIVE:
|
||||
dp_display_hdcp_register_streams(dp);
|
||||
if (dp->hdcp.ops && dp->hdcp.ops->authenticate)
|
||||
rc = dp->hdcp.ops->authenticate(data);
|
||||
if (!rc)
|
||||
status->hdcp_state = HDCP_STATE_AUTHENTICATING;
|
||||
break;
|
||||
case HDCP_STATE_AUTH_FAIL:
|
||||
if (dp_display_is_ready(dp) && dp->power_on) {
|
||||
|
|
|
|||
Loading…
Reference in a new issue