From c6ee753a485ae0e378c70194183e1cafc1553bd8 Mon Sep 17 00:00:00 2001 From: Suprith Malligere Shankaregowda Date: Thu, 19 Jul 2018 14:32:30 +0530 Subject: [PATCH] drm: msm: remove hdcp related error messages HDMI display on auto boards has disabled pluggable function and hardcoded 1080p mode for output. So ddc related function should also be skipped. Otherwise, some HDCP related error messages are printed during boot up when accessing ddc. Change-Id: I0fea0470dd11cc599bc7eb86d7fe3fb4ccf96693 Signed-off-by: Suprith Malligere Shankaregowda --- .../drm/msm/hdmi-staging/sde_hdmi_bridge.c | 29 ++++++++++--------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/drivers/gpu/drm/msm/hdmi-staging/sde_hdmi_bridge.c b/drivers/gpu/drm/msm/hdmi-staging/sde_hdmi_bridge.c index 120a6defc868..ecf93f2c07ac 100644 --- a/drivers/gpu/drm/msm/hdmi-staging/sde_hdmi_bridge.c +++ b/drivers/gpu/drm/msm/hdmi-staging/sde_hdmi_bridge.c @@ -591,21 +591,24 @@ static void sde_hdmi_update_hdcp_info(struct drm_connector *connector) DEV_ERR("%s: invalid input\n", __func__); return; } - - /* 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 + if (display->skip_ddc) { + display->sink_hdcp22_support = 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 (display->hdcp22_present) display->src_hdcp22_support = true;