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

Merge "drm: msm: remove hdcp related error messages"

Browse source
This commit is contained in:
Linux Build Service Account 2018-08-28 04:02:54 -07:00 • committed by Gerrit - the friendly Code Review server
commit b407bf5fca
1 changed files with 16 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
drivers/gpu/drm/msm/hdmi-staging/sde_hdmi_bridge.c
View file

@ -591,21 +591,24 @@ static void sde_hdmi_update_hdcp_info(struct drm_connector *connector)
DEV_ERR("%s: invalid input\n", __func__); DEV_ERR("%s: invalid input\n", __func__);
return; return;
} }
if (display->skip_ddc) {
/* check first if hdcp2p2 is supported */ display->sink_hdcp22_support = false;
fd = display->hdcp_feat_data[SDE_HDCP_2P2];
if (fd)
ops = sde_hdmi_hdcp2p2_start(fd);
/* If ops is true, sink supports hdcp */
if (ops)
display->sink_hdcp22_support = true;
if (ops && ops->feature_supported)
display->hdcp22_present = ops->feature_supported(fd);
else
display->hdcp22_present = false; display->hdcp22_present = false;
} else {
/* check first if hdcp2p2 is supported */
fd = display->hdcp_feat_data[SDE_HDCP_2P2];
if (fd)
ops = sde_hdmi_hdcp2p2_start(fd);
/* If ops is true, sink supports hdcp */
if (ops)
display->sink_hdcp22_support = true;
if (ops && ops->feature_supported)
display->hdcp22_present = ops->feature_supported(fd);
else
display->hdcp22_present = false;
}
/* if hdcp22_present is true, src supports hdcp 2p2 */ /* if hdcp22_present is true, src supports hdcp 2p2 */
if (display->hdcp22_present) if (display->hdcp22_present)
display->src_hdcp22_support = true; display->src_hdcp22_support = true;