dri-devel.lists.freedesktop.org archive mirror
 help / color / mirror / Atom feed
From: Ramalingam C <ramalingam.c@intel.com>
To: intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org,
	daniel@ffwll.ch, tomas.winkler@intel.com,
	alexander.usyskin@intel.com, uma.shankar@intel.com
Subject: [PATCH v5 14/40] drm/i915: Enable and Disable HDCP2.2 port encryption
Date: Wed, 27 Jun 2018 14:10:03 +0530	[thread overview]
Message-ID: <1530088829-11730-15-git-send-email-ramalingam.c@intel.com> (raw)
In-Reply-To: <1530088829-11730-1-git-send-email-ramalingam.c@intel.com>

Implements the enable and disable functions for HDCP2.2 encryption
of the PORT.

v2:
  intel_wait_for_register is used instead of wait_for. [Chris Wilson]
v3:
  No Changes.
v4:
  Debug msg is added for timeout at Disable of Encryption [Uma]
  %s/HDCP2_CTL/HDCP2_CTL
v5:
  Rebased as part of patch reordering.
  HW state check is moved into WARN_ON [Daniel]

Signed-off-by: Ramalingam C <ramalingam.c@intel.com>
---
 drivers/gpu/drm/i915/intel_hdcp.c | 48 +++++++++++++++++++++++++++++++++++++--
 1 file changed, 46 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_hdcp.c b/drivers/gpu/drm/i915/intel_hdcp.c
index f72684488bc7..1e75b4fc978a 100644
--- a/drivers/gpu/drm/i915/intel_hdcp.c
+++ b/drivers/gpu/drm/i915/intel_hdcp.c
@@ -17,6 +17,7 @@
 #include "i915_reg.h"
 
 #define KEY_LOAD_TRIES	5
+#define TIME_FOR_ENCRYPT_STATUS_CHANGE	32
 #define GET_MEI_DDI_INDEX(port)		(((port) == PORT_A) ? DDI_A : \
 					 (enum hdcp_physical_port)(port))
 
@@ -1027,12 +1028,55 @@ static int hdcp2_authenticate_sink(struct intel_connector *connector)
 
 static int hdcp2_enable_encryption(struct intel_connector *connector)
 {
-	return 0;
+	struct intel_digital_port *intel_dig_port = conn_to_dig_port(connector);
+	struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
+	struct intel_hdcp *hdcp = &connector->hdcp;
+	enum port port = connector->encoder->port;
+	int ret;
+
+	WARN_ON(I915_READ(HDCP2_STATUS_DDI(port)) & LINK_ENCRYPTION_STATUS);
+
+	if (hdcp->hdcp_shim->toggle_signalling)
+		hdcp->hdcp_shim->toggle_signalling(intel_dig_port, true);
+
+	if (I915_READ(HDCP2_STATUS_DDI(port)) & LINK_AUTH_STATUS) {
+		/* Link is Authenticated. Now set for Encryption */
+		I915_WRITE(HDCP2_CTL_DDI(port),
+			   I915_READ(HDCP2_CTL_DDI(port)) |
+			   CTL_LINK_ENCRYPTION_REQ);
+	}
+
+	ret = intel_wait_for_register(dev_priv, HDCP2_STATUS_DDI(port),
+				      LINK_ENCRYPTION_STATUS,
+				      LINK_ENCRYPTION_STATUS,
+				      TIME_FOR_ENCRYPT_STATUS_CHANGE);
+
+	return ret;
 }
 
 static int hdcp2_disable_encryption(struct intel_connector *connector)
 {
-	return 0;
+	struct intel_digital_port *intel_dig_port = conn_to_dig_port(connector);
+	struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
+	struct intel_hdcp *hdcp = &connector->hdcp;
+	enum port port = connector->encoder->port;
+	int ret;
+
+	WARN_ON(!(I915_READ(HDCP2_STATUS_DDI(port)) & LINK_ENCRYPTION_STATUS));
+
+	I915_WRITE(HDCP2_CTL_DDI(port),
+		   I915_READ(HDCP2_CTL_DDI(port)) & ~CTL_LINK_ENCRYPTION_REQ);
+
+	ret = intel_wait_for_register(dev_priv, HDCP2_STATUS_DDI(port),
+				      LINK_ENCRYPTION_STATUS, 0x0,
+				      TIME_FOR_ENCRYPT_STATUS_CHANGE);
+	if (ret == -ETIMEDOUT)
+		DRM_DEBUG_KMS("Disable Encryption Timedout");
+
+	if (hdcp->hdcp_shim->toggle_signalling)
+		hdcp->hdcp_shim->toggle_signalling(intel_dig_port, false);
+
+	return ret;
 }
 
 static int hdcp2_authenticate_and_encrypt(struct intel_connector *connector)
-- 
2.7.4

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

  parent reply	other threads:[~2018-06-27  8:40 UTC|newest]

Thread overview: 70+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-06-27  8:39 [PATCH v5 00/40] drm/i915: Implement HDCP2.2 Ramalingam C
2018-06-27  8:39 ` [PATCH v5 01/40] drm: hdcp2.2 authentication msg definitions Ramalingam C
2018-07-09 20:21   ` Sean Paul
2018-07-11 17:57     ` C, Ramalingam
2018-07-11 19:08       ` Sean Paul
2018-07-12  3:52         ` [Intel-gfx] " C, Ramalingam
2018-06-27  8:39 ` [PATCH v5 02/40] drm: HDMI and DP specific HDCP2.2 defines Ramalingam C
2018-07-09 20:23   ` Sean Paul
2018-07-11 17:59     ` C, Ramalingam
2018-06-27  8:39 ` [PATCH v5 03/40] mei: bus: whitelist hdcp client Ramalingam C
2018-06-27  8:39 ` [PATCH v5 04/40] linux/mei: Header for mei_hdcp driver interface Ramalingam C
2018-06-27  8:39 ` [PATCH v5 05/40] drm/i915: wrapping all hdcp var into intel_hdcp Ramalingam C
2018-07-09 20:30   ` Sean Paul
2018-07-11 18:06     ` C, Ramalingam
2018-06-27  8:39 ` [PATCH v5 06/40] drm/i915: Define HDCP2.2 related variables Ramalingam C
2018-07-09 20:31   ` Sean Paul
2018-07-12 14:33     ` Ramalingam C
2018-06-27  8:39 ` [PATCH v5 07/40] drm/i915: Define Intel HDCP2.2 registers Ramalingam C
2018-07-09 20:31   ` Sean Paul
2018-06-27  8:39 ` [PATCH v5 08/40] drm/i915: Initialize HDCP2.2 and its MEI interface Ramalingam C
2018-06-28 11:41   ` [Intel-gfx] " Dan Carpenter
2018-06-27  8:39 ` [PATCH v5 09/40] drm/i915: Schedule hdcp_check_link in _intel_hdcp_enable Ramalingam C
2018-07-09 20:34   ` Sean Paul
2018-07-11 19:07     ` C, Ramalingam
2018-07-11 21:05       ` Sean Paul
2018-07-12  3:49         ` C, Ramalingam
2018-06-27  8:39 ` [PATCH v5 10/40] drm/i915: Pullout the bksv read and validation Ramalingam C
2018-07-09 20:35   ` [Intel-gfx] " Sean Paul
2018-06-27  8:40 ` [PATCH v5 11/40] drm/i915: Enable superior HDCP ver that is capable Ramalingam C
2018-07-09 20:44   ` Sean Paul
2018-07-12 14:30     ` Ramalingam C
2018-06-27  8:40 ` [PATCH v5 12/40] drm/i915: Enable HDCP1.4 incase of HDCP2.2 failure Ramalingam C
2018-07-09 20:44   ` Sean Paul
2018-07-12 14:31     ` [Intel-gfx] " Ramalingam C
2018-06-27  8:40 ` [PATCH v5 13/40] drm/i915: Implement HDCP2.2 Enable and Disable Ramalingam C
2018-07-09 20:48   ` [Intel-gfx] " Sean Paul
2018-07-12 14:41     ` Ramalingam C
2018-06-27  8:40 ` Ramalingam C [this message]
2018-06-27  8:40 ` [PATCH v5 15/40] drm/i915: Implement HDCP2.2 receiver authentication Ramalingam C
2018-06-27  8:40 ` [PATCH v5 16/40] drm/i915: Implement HDCP2.2 repeater authentication Ramalingam C
2018-06-27 14:23   ` kbuild test robot
2018-06-27  8:40 ` [PATCH v5 17/40] drm/i915: Implement HDCP2.2 link integrity check Ramalingam C
2018-06-27  8:40 ` [PATCH v5 18/40] drm/i915: Handle HDCP2.2 downstream topology change Ramalingam C
2018-06-27  8:40 ` [PATCH v5 19/40] drm/i915: hdcp_check_link only on CP_IRQ Ramalingam C
2018-07-09 20:49   ` Sean Paul
2018-06-27  8:40 ` [PATCH v5 20/40] drm/i915: Check HDCP 1.4 and 2.2 link " Ramalingam C
2018-07-09 20:50   ` Sean Paul
2018-07-12  3:54     ` C, Ramalingam
2018-06-27  8:40 ` [PATCH v5 21/40] drm/i915/gmbus: Increase the Bytes per Rd/Wr Op Ramalingam C
2018-06-27  8:40 ` [PATCH v5 22/40] drm/i915/gmbus: Enable burst read Ramalingam C
2018-06-27  8:40 ` [PATCH v5 23/40] drm/i915: Implement the HDCP2.2 support for DP Ramalingam C
2018-06-27  8:40 ` [PATCH v5 24/40] drm/i915: Implement the HDCP2.2 support for HDMI Ramalingam C
2018-06-27  8:40 ` [PATCH v5 25/40] drm/i915: Add HDCP2.2 support for DP connectors Ramalingam C
2018-06-27  8:40 ` [PATCH v5 26/40] drm/i915: Add HDCP2.2 support for HDMI connectors Ramalingam C
2018-06-27  8:40 ` [PATCH v5 27/40] misc/mei/hdcp: Client driver for HDCP application Ramalingam C
2018-06-27  8:40 ` [PATCH v5 28/40] misc/mei/hdcp: Component framework for I915 Interface Ramalingam C
2018-06-27 14:46   ` kbuild test robot
2018-06-27 14:46   ` [RFC PATCH] misc/mei/hdcp: mei_hdcp_component_registered can be static kbuild test robot
2018-06-27  8:40 ` [PATCH v5 29/40] misc/mei/hdcp: Define ME FW interface for HDCP2.2 Ramalingam C
2018-06-27  8:40 ` [PATCH v5 30/40] misc/mei/hdcp: Initiate Wired HDCP2.2 Tx Session Ramalingam C
2018-06-27  8:40 ` [PATCH v5 31/40] misc/mei/hdcp: Verify Receiver Cert and prepare km Ramalingam C
2018-06-27  8:40 ` [PATCH v5 32/40] misc/mei/hdcp: Verify H_prime Ramalingam C
2018-06-27  8:40 ` [PATCH v5 33/40] misc/mei/hdcp: Store the HDCP Pairing info Ramalingam C
2018-06-27  8:40 ` [PATCH v5 34/40] misc/mei/hdcp: Initiate Locality check Ramalingam C
2018-06-27  8:40 ` [PATCH v5 35/40] misc/mei/hdcp: Verify L_prime Ramalingam C
2018-06-27  8:40 ` [PATCH v5 36/40] misc/mei/hdcp: Prepare Session Key Ramalingam C
2018-06-27  8:40 ` [PATCH v5 37/40] misc/mei/hdcp: Repeater topology verification and ack Ramalingam C
2018-06-27  8:40 ` [PATCH v5 38/40] misc/mei/hdcp: Verify M_prime Ramalingam C
2018-06-27  8:40 ` [PATCH v5 39/40] misc/mei/hdcp: Enabling the HDCP authentication Ramalingam C
2018-06-27  8:40 ` [PATCH v5 40/40] misc/mei/hdcp: Closing wired HDCP2.2 Tx Session Ramalingam C

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1530088829-11730-15-git-send-email-ramalingam.c@intel.com \
    --to=ramalingam.c@intel.com \
    --cc=alexander.usyskin@intel.com \
    --cc=daniel@ffwll.ch \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=intel-gfx@lists.freedesktop.org \
    --cc=tomas.winkler@intel.com \
    --cc=uma.shankar@intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).