diff options
| author | Vishnuvardhan Prodduturi <vproddut@codeaurora.org> | 2017-09-19 16:57:05 +0530 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-10-08 23:09:11 -0700 |
| commit | 6995e0f6d7752acdfc591d2ec3f7cb4053b11b94 (patch) | |
| tree | 4e1ec20e8b1ca9ee17604534298ebaa24461353d | |
| parent | 6604cb543eeb8190109e30e6fdbe977466c42aba (diff) | |
msm: mdss: hdcp_1x: call HDCP 1x APIs only if HDCP 2.2 is not present
HDCP1x module is initialized only if HDCP 2.2 is not present either from
the source OR sink side. Make sure to call the HDCP 1x APIs only if
HDCP 2.2 is not present. Otherwise this leads to a crash.
Change-Id: Id66dec10ffd585630a2e4c1e5c75bee99ce515de
Signed-off-by: Vishnuvardhan Prodduturi <vproddut@codeaurora.org>
| -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 a5a407708334..601171805620 100644 --- a/drivers/video/fbdev/msm/mdss_hdmi_tx.c +++ b/drivers/video/fbdev/msm/mdss_hdmi_tx.c @@ -1577,12 +1577,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); } |