Merge "msm: mdss: hdcp_1x: call HDCP 1x APIs only if HDCP 2.2 is not present"

This commit is contained in:
Linux Build Service Account 2018-03-23 14:43:48 -07:00 committed by Gerrit - the friendly Code Review server
commit c4d8eef8df

View file

@ -1575,12 +1575,14 @@ static void hdmi_tx_hdcp_cb_work(struct work_struct *work)
rc = hdmi_tx_config_avmute(hdmi_ctrl, false);
}
if (hdmi_ctrl->hdcp1_use_sw_keys && hdmi_ctrl->hdcp14_present)
hdcp1_set_enc(true);
if (hdmi_ctrl->hdcp1_use_sw_keys && hdmi_ctrl->hdcp14_present) {
if (!hdmi_ctrl->hdcp22_present)
hdcp1_set_enc(true);
}
break;
case HDCP_STATE_AUTH_FAIL:
if (hdmi_ctrl->hdcp1_use_sw_keys && hdmi_ctrl->hdcp14_present) {
if (hdmi_ctrl->auth_state)
if (hdmi_ctrl->auth_state && !hdmi_ctrl->hdcp22_present)
hdcp1_set_enc(false);
}