diff options
| author |   Ramalingam C <ramalingam.c@intel.com> | 2018-02-03 03:39:03 +0530 |
|---|---|---|
| committer |   Sean Paul <seanpaul@chromium.org> | 2018-02-05 12:58:45 -0500 |
| commit | a01244967d4311afb1a8e068184c2a30202025f5 (patch) | |
| tree | 0b4eb6e2e3863992abd7d24aef964394792e3b0c /drivers/gpu/drm/i915/intel_hdcp.c | |
| parent | drm/i915: Downgrade hdcp logs from INFO to DEBUG_KMS (diff) | |
| download | linux-dev-a01244967d4311afb1a8e068184c2a30202025f5.tar.xz linux-dev-a01244967d4311afb1a8e068184c2a30202025f5.zip | |
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 <ramalingam.c@intel.com>
Reviewed-by: Sean Paul <seanpaul@chromium.org>
Signed-off-by: Sean Paul <seanpaul@chromium.org>
Link: https://patchwork.freedesktop.org/patch/msgid/1517609350-10698-2-git-send-email-ramalingam.c@intel.com
Diffstat (limited to 'drivers/gpu/drm/i915/intel_hdcp.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_hdcp.c | 3 |
1 files changed, 3 insertions, 0 deletions
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; } |