From a01244967d4311afb1a8e068184c2a30202025f5 Mon Sep 17 00:00:00 2001 From: Ramalingam C Date: Sat, 3 Feb 2018 03:39:03 +0530 Subject: [PATCH] drm/i915: Handle failure from 2nd stage HDCP auth We enable the HDCP encryption as a part of first stage authentication. So when second stage authentication fails, we need to disable the HDCP encryption and signalling. This patch ensures that, when hdcp authentication fails, HDCP encryption and signalling is turned off. v2: Dropped connector ref passing to auth [Seanpaul] Moved the call to disable_hdcp() to enable_hdcp() [Seanpaul] v3: No Changes. Added the Reveiwed-by tag. Signed-off-by: Ramalingam C Reviewed-by: Sean Paul Signed-off-by: Sean Paul Link: https://patchwork.freedesktop.org/patch/msgid/1517609350-10698-2-git-send-email-ramalingam.c@intel.com --- drivers/gpu/drm/i915/intel_hdcp.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/gpu/drm/i915/intel_hdcp.c b/drivers/gpu/drm/i915/intel_hdcp.c index b97184eccd9c..de9a925c122d 100644 --- a/drivers/gpu/drm/i915/intel_hdcp.c +++ b/drivers/gpu/drm/i915/intel_hdcp.c @@ -562,6 +562,9 @@ static int _intel_hdcp_enable(struct intel_connector *connector) connector->hdcp_shim); if (ret) { DRM_ERROR("Failed to authenticate HDCP (%d)\n", ret); + + /* Ensuring HDCP encryption and signalling are stopped. */ + _intel_hdcp_disable(connector); return ret; } -- 2.45.2