diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2018-03-23 14:43:48 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2018-03-23 14:43:47 -0700 |
| commit | c4d8eef8dfed8ca130c30244d0574ccd8fc2130b (patch) | |
| tree | 92a57ad98931ca1481c82f60ebff0bdebb72ca40 | |
| parent | 9a72ed233c1e39bd9952e9a62c5a1912af77df8f (diff) | |
| parent | 6995e0f6d7752acdfc591d2ec3f7cb4053b11b94 (diff) | |
Merge "msm: mdss: hdcp_1x: call HDCP 1x APIs only if HDCP 2.2 is not present"
| -rw-r--r-- | drivers/video/fbdev/msm/mdss_hdmi_tx.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/video/fbdev/msm/mdss_hdmi_tx.c b/drivers/video/fbdev/msm/mdss_hdmi_tx.c index 5d9e7072ae33..da974715e0ab 100644 --- a/drivers/video/fbdev/msm/mdss_hdmi_tx.c +++ b/drivers/video/fbdev/msm/mdss_hdmi_tx.c @@ -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); } |