All of lore.kernel.org
 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 05/40] drm/i915: wrapping all hdcp var into intel_hdcp
Date: Wed, 27 Jun 2018 14:09:54 +0530	[thread overview]
Message-ID: <1530088829-11730-6-git-send-email-ramalingam.c@intel.com> (raw)
In-Reply-To: <1530088829-11730-1-git-send-email-ramalingam.c@intel.com>

Considering significant number of HDCP specific variables, it will
be clean to have separate struct for HDCP.

New structure called intel_hdcp is added within intel_connector.

v2:
  struct hdcp statically allocated. [Sean Paul]
  enable and disable function parameters are retained.[Sean Paul]
v3:
  No Changes.
v4:
  Commit msg is rephrased [Uma]
v5:
  Comment for mutex definition.

Signed-off-by: Ramalingam C <ramalingam.c@intel.com>
---
 drivers/gpu/drm/i915/intel_display.c |  7 +--
 drivers/gpu/drm/i915/intel_drv.h     | 15 ++++--
 drivers/gpu/drm/i915/intel_hdcp.c    | 94 ++++++++++++++++++++----------------
 3 files changed, 67 insertions(+), 49 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 3d849ec17f5c..ef09bb89d2ca 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -15856,9 +15856,10 @@ static void intel_hpd_poll_fini(struct drm_device *dev)
 	for_each_intel_connector_iter(connector, &conn_iter) {
 		if (connector->modeset_retry_work.func)
 			cancel_work_sync(&connector->modeset_retry_work);
-		if (connector->hdcp_shim) {
-			cancel_delayed_work_sync(&connector->hdcp_check_work);
-			cancel_work_sync(&connector->hdcp_prop_work);
+		if (connector->hdcp.hdcp_shim) {
+			cancel_delayed_work_sync(
+					&connector->hdcp.hdcp_check_work);
+			cancel_work_sync(&connector->hdcp.hdcp_prop_work);
 		}
 	}
 	drm_connector_list_iter_end(&conn_iter);
diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
index 578346b8d7e2..eb480574a92e 100644
--- a/drivers/gpu/drm/i915/intel_drv.h
+++ b/drivers/gpu/drm/i915/intel_drv.h
@@ -377,6 +377,15 @@ struct intel_hdcp_shim {
 			    bool *hdcp_capable);
 };
 
+struct intel_hdcp {
+	const struct intel_hdcp_shim *hdcp_shim;
+	/* Mutex for hdcp state of the connector */
+	struct mutex hdcp_mutex;
+	uint64_t hdcp_value;
+	struct delayed_work hdcp_check_work;
+	struct work_struct hdcp_prop_work;
+};
+
 struct intel_connector {
 	struct drm_connector base;
 	/*
@@ -409,11 +418,7 @@ struct intel_connector {
 	/* Work struct to schedule a uevent on link train failure */
 	struct work_struct modeset_retry_work;
 
-	const struct intel_hdcp_shim *hdcp_shim;
-	struct mutex hdcp_mutex;
-	uint64_t hdcp_value; /* protected by hdcp_mutex */
-	struct delayed_work hdcp_check_work;
-	struct work_struct hdcp_prop_work;
+	struct intel_hdcp hdcp;
 };
 
 struct intel_digital_connector_state {
diff --git a/drivers/gpu/drm/i915/intel_hdcp.c b/drivers/gpu/drm/i915/intel_hdcp.c
index 0cc6a861bcf8..65bbe5874eee 100644
--- a/drivers/gpu/drm/i915/intel_hdcp.c
+++ b/drivers/gpu/drm/i915/intel_hdcp.c
@@ -626,6 +626,7 @@ struct intel_digital_port *conn_to_dig_port(struct intel_connector *connector)
 
 static int _intel_hdcp_disable(struct intel_connector *connector)
 {
+	struct intel_hdcp *hdcp = &connector->hdcp;
 	struct drm_i915_private *dev_priv = connector->base.dev->dev_private;
 	struct intel_digital_port *intel_dig_port = conn_to_dig_port(connector);
 	enum port port = intel_dig_port->base.port;
@@ -641,7 +642,7 @@ static int _intel_hdcp_disable(struct intel_connector *connector)
 		return -ETIMEDOUT;
 	}
 
-	ret = connector->hdcp_shim->toggle_signalling(intel_dig_port, false);
+	ret = hdcp->hdcp_shim->toggle_signalling(intel_dig_port, false);
 	if (ret) {
 		DRM_ERROR("Failed to disable HDCP signalling\n");
 		return ret;
@@ -653,6 +654,7 @@ static int _intel_hdcp_disable(struct intel_connector *connector)
 
 static int _intel_hdcp_enable(struct intel_connector *connector)
 {
+	struct intel_hdcp *hdcp = &connector->hdcp;
 	struct drm_i915_private *dev_priv = connector->base.dev->dev_private;
 	int i, ret, tries = 3;
 
@@ -678,7 +680,7 @@ static int _intel_hdcp_enable(struct intel_connector *connector)
 	/* Incase of authentication failures, HDCP spec expects reauth. */
 	for (i = 0; i < tries; i++) {
 		ret = intel_hdcp_auth(conn_to_dig_port(connector),
-				      connector->hdcp_shim);
+				      hdcp->hdcp_shim);
 		if (!ret)
 			return 0;
 
@@ -694,36 +696,42 @@ static int _intel_hdcp_enable(struct intel_connector *connector)
 
 static void intel_hdcp_check_work(struct work_struct *work)
 {
-	struct intel_connector *connector = container_of(to_delayed_work(work),
+	struct intel_hdcp *hdcp = container_of(to_delayed_work(work),
+					       struct intel_hdcp,
+					       hdcp_check_work);
+	struct intel_connector *connector = container_of(hdcp,
 							 struct intel_connector,
-							 hdcp_check_work);
+							 hdcp);
+
 	if (!intel_hdcp_check_link(connector))
-		schedule_delayed_work(&connector->hdcp_check_work,
+		schedule_delayed_work(&hdcp->hdcp_check_work,
 				      DRM_HDCP_CHECK_PERIOD_MS);
 }
 
 static void intel_hdcp_prop_work(struct work_struct *work)
 {
-	struct intel_connector *connector = container_of(work,
+	struct intel_hdcp *hdcp = container_of(work, struct intel_hdcp,
+					       hdcp_prop_work);
+	struct intel_connector *connector = container_of(hdcp,
 							 struct intel_connector,
-							 hdcp_prop_work);
+							 hdcp);
 	struct drm_device *dev = connector->base.dev;
 	struct drm_connector_state *state;
 
 	drm_modeset_lock(&dev->mode_config.connection_mutex, NULL);
-	mutex_lock(&connector->hdcp_mutex);
+	mutex_lock(&hdcp->hdcp_mutex);
 
 	/*
 	 * This worker is only used to flip between ENABLED/DESIRED. Either of
 	 * those to UNDESIRED is handled by core. If hdcp_value == UNDESIRED,
 	 * we're running just after hdcp has been disabled, so just exit
 	 */
-	if (connector->hdcp_value != DRM_MODE_CONTENT_PROTECTION_UNDESIRED) {
+	if (hdcp->hdcp_value != DRM_MODE_CONTENT_PROTECTION_UNDESIRED) {
 		state = connector->base.state;
-		state->content_protection = connector->hdcp_value;
+		state->content_protection = hdcp->hdcp_value;
 	}
 
-	mutex_unlock(&connector->hdcp_mutex);
+	mutex_unlock(&hdcp->hdcp_mutex);
 	drm_modeset_unlock(&dev->mode_config.connection_mutex);
 }
 
@@ -737,6 +745,7 @@ bool is_hdcp_supported(struct drm_i915_private *dev_priv, enum port port)
 int intel_hdcp_init(struct intel_connector *connector,
 		    const struct intel_hdcp_shim *hdcp_shim)
 {
+	struct intel_hdcp *hdcp = &connector->hdcp;
 	int ret;
 
 	ret = drm_connector_attach_content_protection_property(
@@ -744,51 +753,53 @@ int intel_hdcp_init(struct intel_connector *connector,
 	if (ret)
 		return ret;
 
-	connector->hdcp_shim = hdcp_shim;
-	mutex_init(&connector->hdcp_mutex);
-	INIT_DELAYED_WORK(&connector->hdcp_check_work, intel_hdcp_check_work);
-	INIT_WORK(&connector->hdcp_prop_work, intel_hdcp_prop_work);
+	hdcp->hdcp_shim = hdcp_shim;
+	mutex_init(&hdcp->hdcp_mutex);
+	INIT_DELAYED_WORK(&hdcp->hdcp_check_work, intel_hdcp_check_work);
+	INIT_WORK(&hdcp->hdcp_prop_work, intel_hdcp_prop_work);
 	return 0;
 }
 
 int intel_hdcp_enable(struct intel_connector *connector)
 {
+	struct intel_hdcp *hdcp = &connector->hdcp;
 	int ret;
 
-	if (!connector->hdcp_shim)
+	if (!hdcp->hdcp_shim)
 		return -ENOENT;
 
-	mutex_lock(&connector->hdcp_mutex);
+	mutex_lock(&hdcp->hdcp_mutex);
 
 	ret = _intel_hdcp_enable(connector);
 	if (ret)
 		goto out;
 
-	connector->hdcp_value = DRM_MODE_CONTENT_PROTECTION_ENABLED;
-	schedule_work(&connector->hdcp_prop_work);
-	schedule_delayed_work(&connector->hdcp_check_work,
+	hdcp->hdcp_value = DRM_MODE_CONTENT_PROTECTION_ENABLED;
+	schedule_work(&hdcp->hdcp_prop_work);
+	schedule_delayed_work(&hdcp->hdcp_check_work,
 			      DRM_HDCP_CHECK_PERIOD_MS);
 out:
-	mutex_unlock(&connector->hdcp_mutex);
+	mutex_unlock(&hdcp->hdcp_mutex);
 	return ret;
 }
 
 int intel_hdcp_disable(struct intel_connector *connector)
 {
+	struct intel_hdcp *hdcp = &connector->hdcp;
 	int ret = 0;
 
-	if (!connector->hdcp_shim)
+	if (!hdcp->hdcp_shim)
 		return -ENOENT;
 
-	mutex_lock(&connector->hdcp_mutex);
+	mutex_lock(&hdcp->hdcp_mutex);
 
-	if (connector->hdcp_value != DRM_MODE_CONTENT_PROTECTION_UNDESIRED) {
-		connector->hdcp_value = DRM_MODE_CONTENT_PROTECTION_UNDESIRED;
+	if (hdcp->hdcp_value != DRM_MODE_CONTENT_PROTECTION_UNDESIRED) {
+		hdcp->hdcp_value = DRM_MODE_CONTENT_PROTECTION_UNDESIRED;
 		ret = _intel_hdcp_disable(connector);
 	}
 
-	mutex_unlock(&connector->hdcp_mutex);
-	cancel_delayed_work_sync(&connector->hdcp_check_work);
+	mutex_unlock(&hdcp->hdcp_mutex);
+	cancel_delayed_work_sync(&hdcp->hdcp_check_work);
 	return ret;
 }
 
@@ -828,17 +839,18 @@ void intel_hdcp_atomic_check(struct drm_connector *connector,
 /* Implements Part 3 of the HDCP authorization procedure */
 int intel_hdcp_check_link(struct intel_connector *connector)
 {
+	struct intel_hdcp *hdcp = &connector->hdcp;
 	struct drm_i915_private *dev_priv = connector->base.dev->dev_private;
 	struct intel_digital_port *intel_dig_port = conn_to_dig_port(connector);
 	enum port port = intel_dig_port->base.port;
 	int ret = 0;
 
-	if (!connector->hdcp_shim)
+	if (!hdcp->hdcp_shim)
 		return -ENOENT;
 
-	mutex_lock(&connector->hdcp_mutex);
+	mutex_lock(&hdcp->hdcp_mutex);
 
-	if (connector->hdcp_value == DRM_MODE_CONTENT_PROTECTION_UNDESIRED)
+	if (hdcp->hdcp_value == DRM_MODE_CONTENT_PROTECTION_UNDESIRED)
 		goto out;
 
 	if (!(I915_READ(PORT_HDCP_STATUS(port)) & HDCP_STATUS_ENC)) {
@@ -846,17 +858,17 @@ int intel_hdcp_check_link(struct intel_connector *connector)
 			  connector->base.name, connector->base.base.id,
 			  I915_READ(PORT_HDCP_STATUS(port)));
 		ret = -ENXIO;
-		connector->hdcp_value = DRM_MODE_CONTENT_PROTECTION_DESIRED;
-		schedule_work(&connector->hdcp_prop_work);
+		hdcp->hdcp_value = DRM_MODE_CONTENT_PROTECTION_DESIRED;
+		schedule_work(&hdcp->hdcp_prop_work);
 		goto out;
 	}
 
-	if (connector->hdcp_shim->check_link(intel_dig_port)) {
-		if (connector->hdcp_value !=
+	if (hdcp->hdcp_shim->check_link(intel_dig_port)) {
+		if (hdcp->hdcp_value !=
 		    DRM_MODE_CONTENT_PROTECTION_UNDESIRED) {
-			connector->hdcp_value =
+			hdcp->hdcp_value =
 				DRM_MODE_CONTENT_PROTECTION_ENABLED;
-			schedule_work(&connector->hdcp_prop_work);
+			schedule_work(&hdcp->hdcp_prop_work);
 		}
 		goto out;
 	}
@@ -867,20 +879,20 @@ int intel_hdcp_check_link(struct intel_connector *connector)
 	ret = _intel_hdcp_disable(connector);
 	if (ret) {
 		DRM_ERROR("Failed to disable hdcp (%d)\n", ret);
-		connector->hdcp_value = DRM_MODE_CONTENT_PROTECTION_DESIRED;
-		schedule_work(&connector->hdcp_prop_work);
+		hdcp->hdcp_value = DRM_MODE_CONTENT_PROTECTION_DESIRED;
+		schedule_work(&hdcp->hdcp_prop_work);
 		goto out;
 	}
 
 	ret = _intel_hdcp_enable(connector);
 	if (ret) {
 		DRM_ERROR("Failed to enable hdcp (%d)\n", ret);
-		connector->hdcp_value = DRM_MODE_CONTENT_PROTECTION_DESIRED;
-		schedule_work(&connector->hdcp_prop_work);
+		hdcp->hdcp_value = DRM_MODE_CONTENT_PROTECTION_DESIRED;
+		schedule_work(&hdcp->hdcp_prop_work);
 		goto out;
 	}
 
 out:
-	mutex_unlock(&connector->hdcp_mutex);
+	mutex_unlock(&hdcp->hdcp_mutex);
 	return ret;
 }
-- 
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:39 UTC|newest]

Thread overview: 74+ 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 ` Ramalingam C [this message]
2018-07-09 20:30   ` [PATCH v5 05/40] drm/i915: wrapping all hdcp var into intel_hdcp 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 ` [PATCH v5 14/40] drm/i915: Enable and Disable HDCP2.2 port encryption Ramalingam C
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
2018-06-27  9:51 ` ✗ Fi.CI.CHECKPATCH: warning for drm/i915: Implement HDCP2.2 (rev6) Patchwork
2018-06-27 10:01 ` ✗ Fi.CI.SPARSE: " Patchwork
2018-06-27 10:02 ` ✗ Fi.CI.BAT: failure " Patchwork
2018-06-27 17:45 ` ✗ Fi.CI.BAT: failure for drm/i915: Implement HDCP2.2 (rev7) Patchwork

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-6-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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.