[PATCH v5 12/40] drm/i915: Enable HDCP1.4 incase of HDCP2.2 failure

Ramalingam C ramalingam.c at intel.com
Tue Jun 26 13:16:26 UTC 2018


When HDCP2.2 enabling fails and HDCP1.4 is supported, HDCP1.4 is
enabled.

v2:
  Rebased.
v3:
  No Changes.
v4:
  Reviewed-by is collected.
v5:
  No Change.

Signed-off-by: Ramalingam C <ramalingam.c at intel.com>
Reviewed-by: Uma Shankar <uma.shankar at intel.com>
---
 drivers/gpu/drm/i915/intel_hdcp.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/intel_hdcp.c b/drivers/gpu/drm/i915/intel_hdcp.c
index 650f9a5f7479..d71ea84eed84 100644
--- a/drivers/gpu/drm/i915/intel_hdcp.c
+++ b/drivers/gpu/drm/i915/intel_hdcp.c
@@ -863,7 +863,9 @@ int intel_hdcp_enable(struct intel_connector *connector)
 	 */
 	if (intel_hdcp2_capable(connector))
 		ret = _intel_hdcp2_enable(connector);
-	else if (intel_hdcp_capable(connector))
+
+	/* When HDCP2.2 fails, HDCP1.4 will be attempted */
+	if (ret && intel_hdcp_capable(connector))
 		ret = _intel_hdcp_enable(connector);
 
 	if (!ret) {
-- 
2.7.4



More information about the Intel-gfx-trybot mailing list