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

1 files changed, 17 insertions, 14 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;