evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "msm: mdss: hdcp2p2: fix check for sink support for HDCP 2.x"

Browse source
This commit is contained in:
Linux Build Service Account 2017-07-25 00:36:01 -07:00 • committed by Gerrit - the friendly Code Review server
commit 5fd7f75152
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
drivers/video/fbdev/msm/mdss_dp_hdcp2p2.c
View file

@ -894,22 +894,24 @@ static bool dp_hdcp2p2_supported(struct dp_hdcp2p2_ctrl *ctrl)
{ {
struct edp_cmd cmd = {0}; struct edp_cmd cmd = {0};
const u32 offset = 0x6921d; const u32 offset = 0x6921d;
u8 buf; u8 buf[3];
cmd.read = 1; cmd.read = 1;
cmd.addr = offset; cmd.addr = offset;
cmd.len = sizeof(buf); cmd.len = ARRAY_SIZE(buf);
cmd.out_buf = &buf; cmd.out_buf = buf;
if (dp_aux_read(ctrl->init_data.cb_data, &cmd)) { if (dp_aux_read(ctrl->init_data.cb_data, &cmd)) {
pr_err("RxCaps read failed\n"); pr_err("RxCaps read failed\n");
goto error; 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; return true;
error: error:
return false; return false;
} }