diff options
| author | Linux Build Service Account <lnxbuild@quicinc.com> | 2017-07-25 00:36:01 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-07-25 00:36:01 -0700 |
| commit | 5fd7f751523e1623d1c3a602ada5ec48a52fc5a3 (patch) | |
| tree | 37b6a9189e8d30670136e883758ae283c1f9c065 /drivers/video/fbdev/msm | |
| parent | 223b0e823b814babb2d5d7725b53139880512250 (diff) | |
| parent | 8832c1bcedeb429d072639cc45c5c89ee7910189 (diff) | |
Merge "msm: mdss: hdcp2p2: fix check for sink support for HDCP 2.x"
Diffstat (limited to 'drivers/video/fbdev/msm')
| -rw-r--r-- | drivers/video/fbdev/msm/mdss_dp_hdcp2p2.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/drivers/video/fbdev/msm/mdss_dp_hdcp2p2.c b/drivers/video/fbdev/msm/mdss_dp_hdcp2p2.c index 5a677dfe7484..36a062dc5207 100644 --- a/drivers/video/fbdev/msm/mdss_dp_hdcp2p2.c +++ b/drivers/video/fbdev/msm/mdss_dp_hdcp2p2.c @@ -894,22 +894,24 @@ static bool dp_hdcp2p2_supported(struct dp_hdcp2p2_ctrl *ctrl) { struct edp_cmd cmd = {0}; const u32 offset = 0x6921d; - u8 buf; + u8 buf[3]; cmd.read = 1; cmd.addr = offset; - cmd.len = sizeof(buf); - cmd.out_buf = &buf; + cmd.len = ARRAY_SIZE(buf); + cmd.out_buf = buf; if (dp_aux_read(ctrl->init_data.cb_data, &cmd)) { pr_err("RxCaps read failed\n"); goto error; } - pr_debug("rxcaps 0x%x\n", buf); + pr_debug("HDCP_CAPABLE=%lu\n", (buf[2] & BIT(1)) >> 1); + pr_debug("VERSION=%d\n", buf[0]); - if (buf & BIT(1)) + if ((buf[2] & BIT(1)) && (buf[0] == 0x2)) return true; + error: return false; } |