All of lore.kernel.org
 help / color / mirror / Atom feed
From: Anshuman Gupta <anshuman.gupta@intel.com>
To: intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org
Cc: jani.nikula@intel.com, Karthik B S <karthik.b.s@intel.com>,
	uma.shankar@intel.com, seanpaul@chromium.org,
	Anshuman Gupta <anshuman.gupta@intel.com>,
	juston.li@intel.com
Subject: [PATCH v6 15/18] drm/i915/hdcp: Pass connector to check_2_2_link
Date: Thu, 26 Nov 2020 13:07:19 +0530	[thread overview]
Message-ID: <20201126073722.19107-16-anshuman.gupta@intel.com> (raw)
In-Reply-To: <20201126073722.19107-1-anshuman.gupta@intel.com>

This requires for HDCP 2.2 MST check link.
As for DP/HDMI shims check_2_2_link retrieves the connector
from dig_port, this is not sufficient or DP MST connector,
there can be multiple DP MST topology connector associated
with same dig_port.

Cc: Ramalingam C <ramalingam.c@intel.com>
Reviewed-by: Uma Shankar <uma.shankar@intel.com>
Reviewed-by: Ramalingam C <ramalingam.c@intel.com>
Tested-by: Karthik B S <karthik.b.s@intel.com>
Signed-off-by: Anshuman Gupta <anshuman.gupta@intel.com>
---
 drivers/gpu/drm/i915/display/intel_display_types.h | 3 ++-
 drivers/gpu/drm/i915/display/intel_dp_hdcp.c       | 3 ++-
 drivers/gpu/drm/i915/display/intel_hdcp.c          | 2 +-
 drivers/gpu/drm/i915/display/intel_hdmi.c          | 3 ++-
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_display_types.h b/drivers/gpu/drm/i915/display/intel_display_types.h
index 7cdb6bff1b53..bdeef5d2ce7a 100644
--- a/drivers/gpu/drm/i915/display/intel_display_types.h
+++ b/drivers/gpu/drm/i915/display/intel_display_types.h
@@ -375,7 +375,8 @@ struct intel_hdcp_shim {
 				  bool is_repeater, u8 type);
 
 	/* HDCP2.2 Link Integrity Check */
-	int (*check_2_2_link)(struct intel_digital_port *dig_port);
+	int (*check_2_2_link)(struct intel_digital_port *dig_port,
+			      struct intel_connector *connector);
 };
 
 struct intel_hdcp {
diff --git a/drivers/gpu/drm/i915/display/intel_dp_hdcp.c b/drivers/gpu/drm/i915/display/intel_dp_hdcp.c
index 3f23f8b53dcd..9ade1ad3a80c 100644
--- a/drivers/gpu/drm/i915/display/intel_dp_hdcp.c
+++ b/drivers/gpu/drm/i915/display/intel_dp_hdcp.c
@@ -585,7 +585,8 @@ int intel_dp_hdcp2_config_stream_type(struct intel_digital_port *dig_port,
 }
 
 static
-int intel_dp_hdcp2_check_link(struct intel_digital_port *dig_port)
+int intel_dp_hdcp2_check_link(struct intel_digital_port *dig_port,
+			      struct intel_connector *connector)
 {
 	u8 rx_status;
 	int ret;
diff --git a/drivers/gpu/drm/i915/display/intel_hdcp.c b/drivers/gpu/drm/i915/display/intel_hdcp.c
index c21a6a6c545c..65dd39b44688 100644
--- a/drivers/gpu/drm/i915/display/intel_hdcp.c
+++ b/drivers/gpu/drm/i915/display/intel_hdcp.c
@@ -1947,7 +1947,7 @@ static int intel_hdcp2_check_link(struct intel_connector *connector)
 		goto out;
 	}
 
-	ret = hdcp->shim->check_2_2_link(dig_port);
+	ret = hdcp->shim->check_2_2_link(dig_port, connector);
 	if (ret == HDCP_LINK_PROTECTED) {
 		if (hdcp->value != DRM_MODE_CONTENT_PROTECTION_UNDESIRED) {
 			intel_hdcp_update_value(connector,
diff --git a/drivers/gpu/drm/i915/display/intel_hdmi.c b/drivers/gpu/drm/i915/display/intel_hdmi.c
index 40d53a3e4879..650cc06254ab 100644
--- a/drivers/gpu/drm/i915/display/intel_hdmi.c
+++ b/drivers/gpu/drm/i915/display/intel_hdmi.c
@@ -1734,7 +1734,8 @@ int intel_hdmi_hdcp2_read_msg(struct intel_digital_port *dig_port,
 }
 
 static
-int intel_hdmi_hdcp2_check_link(struct intel_digital_port *dig_port)
+int intel_hdmi_hdcp2_check_link(struct intel_digital_port *dig_port,
+				struct intel_connector *connector)
 {
 	u8 rx_status[HDCP_2_2_HDMI_RXSTATUS_LEN];
 	int ret;
-- 
2.26.2

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

WARNING: multiple messages have this Message-ID (diff)
From: Anshuman Gupta <anshuman.gupta@intel.com>
To: intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org
Cc: jani.nikula@intel.com, seanpaul@chromium.org
Subject: [Intel-gfx] [PATCH v6 15/18] drm/i915/hdcp: Pass connector to check_2_2_link
Date: Thu, 26 Nov 2020 13:07:19 +0530	[thread overview]
Message-ID: <20201126073722.19107-16-anshuman.gupta@intel.com> (raw)
In-Reply-To: <20201126073722.19107-1-anshuman.gupta@intel.com>

This requires for HDCP 2.2 MST check link.
As for DP/HDMI shims check_2_2_link retrieves the connector
from dig_port, this is not sufficient or DP MST connector,
there can be multiple DP MST topology connector associated
with same dig_port.

Cc: Ramalingam C <ramalingam.c@intel.com>
Reviewed-by: Uma Shankar <uma.shankar@intel.com>
Reviewed-by: Ramalingam C <ramalingam.c@intel.com>
Tested-by: Karthik B S <karthik.b.s@intel.com>
Signed-off-by: Anshuman Gupta <anshuman.gupta@intel.com>
---
 drivers/gpu/drm/i915/display/intel_display_types.h | 3 ++-
 drivers/gpu/drm/i915/display/intel_dp_hdcp.c       | 3 ++-
 drivers/gpu/drm/i915/display/intel_hdcp.c          | 2 +-
 drivers/gpu/drm/i915/display/intel_hdmi.c          | 3 ++-
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_display_types.h b/drivers/gpu/drm/i915/display/intel_display_types.h
index 7cdb6bff1b53..bdeef5d2ce7a 100644
--- a/drivers/gpu/drm/i915/display/intel_display_types.h
+++ b/drivers/gpu/drm/i915/display/intel_display_types.h
@@ -375,7 +375,8 @@ struct intel_hdcp_shim {
 				  bool is_repeater, u8 type);
 
 	/* HDCP2.2 Link Integrity Check */
-	int (*check_2_2_link)(struct intel_digital_port *dig_port);
+	int (*check_2_2_link)(struct intel_digital_port *dig_port,
+			      struct intel_connector *connector);
 };
 
 struct intel_hdcp {
diff --git a/drivers/gpu/drm/i915/display/intel_dp_hdcp.c b/drivers/gpu/drm/i915/display/intel_dp_hdcp.c
index 3f23f8b53dcd..9ade1ad3a80c 100644
--- a/drivers/gpu/drm/i915/display/intel_dp_hdcp.c
+++ b/drivers/gpu/drm/i915/display/intel_dp_hdcp.c
@@ -585,7 +585,8 @@ int intel_dp_hdcp2_config_stream_type(struct intel_digital_port *dig_port,
 }
 
 static
-int intel_dp_hdcp2_check_link(struct intel_digital_port *dig_port)
+int intel_dp_hdcp2_check_link(struct intel_digital_port *dig_port,
+			      struct intel_connector *connector)
 {
 	u8 rx_status;
 	int ret;
diff --git a/drivers/gpu/drm/i915/display/intel_hdcp.c b/drivers/gpu/drm/i915/display/intel_hdcp.c
index c21a6a6c545c..65dd39b44688 100644
--- a/drivers/gpu/drm/i915/display/intel_hdcp.c
+++ b/drivers/gpu/drm/i915/display/intel_hdcp.c
@@ -1947,7 +1947,7 @@ static int intel_hdcp2_check_link(struct intel_connector *connector)
 		goto out;
 	}
 
-	ret = hdcp->shim->check_2_2_link(dig_port);
+	ret = hdcp->shim->check_2_2_link(dig_port, connector);
 	if (ret == HDCP_LINK_PROTECTED) {
 		if (hdcp->value != DRM_MODE_CONTENT_PROTECTION_UNDESIRED) {
 			intel_hdcp_update_value(connector,
diff --git a/drivers/gpu/drm/i915/display/intel_hdmi.c b/drivers/gpu/drm/i915/display/intel_hdmi.c
index 40d53a3e4879..650cc06254ab 100644
--- a/drivers/gpu/drm/i915/display/intel_hdmi.c
+++ b/drivers/gpu/drm/i915/display/intel_hdmi.c
@@ -1734,7 +1734,8 @@ int intel_hdmi_hdcp2_read_msg(struct intel_digital_port *dig_port,
 }
 
 static
-int intel_hdmi_hdcp2_check_link(struct intel_digital_port *dig_port)
+int intel_hdmi_hdcp2_check_link(struct intel_digital_port *dig_port,
+				struct intel_connector *connector)
 {
 	u8 rx_status[HDCP_2_2_HDMI_RXSTATUS_LEN];
 	int ret;
-- 
2.26.2

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

  parent reply	other threads:[~2020-11-26  7:52 UTC|newest]

Thread overview: 48+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-11-26  7:37 [PATCH v6 00/18] HDCP 2.2 and HDCP 1.4 Gen12 DP MST support Anshuman Gupta
2020-11-26  7:37 ` [Intel-gfx] " Anshuman Gupta
2020-11-26  7:37 ` [PATCH v6 01/18] drm/i915/hdcp: Update CP property in update_pipe Anshuman Gupta
2020-11-26  7:37   ` [Intel-gfx] " Anshuman Gupta
2020-11-26  7:37 ` [PATCH v6 02/18] drm/i915/hdcp: Get conn while content_type changed Anshuman Gupta
2020-11-26  7:37   ` [Intel-gfx] " Anshuman Gupta
2020-11-26  7:37 ` [PATCH v6 03/18] drm/i915/hotplug: Handle CP_IRQ for DP-MST Anshuman Gupta
2020-11-26  7:37   ` [Intel-gfx] " Anshuman Gupta
2020-11-26  7:37 ` [PATCH v6 04/18] drm/i915/hdcp: No HDCP when encoder is't initialized Anshuman Gupta
2020-11-26  7:37   ` [Intel-gfx] " Anshuman Gupta
2020-12-04  9:02   ` Ramalingam C
2020-12-04  9:02     ` [Intel-gfx] " Ramalingam C
2020-12-04  8:58     ` Anshuman Gupta
2020-12-04  8:58       ` [Intel-gfx] " Anshuman Gupta
2020-11-26  7:37 ` [PATCH v6 05/18] drm/i915/hdcp: DP MST transcoder for link and stream Anshuman Gupta
2020-11-26  7:37   ` [Intel-gfx] " Anshuman Gupta
2020-11-26  7:37 ` [PATCH v6 06/18] drm/i915/hdcp: Move HDCP enc status timeout to header Anshuman Gupta
2020-11-26  7:37   ` [Intel-gfx] " Anshuman Gupta
2020-11-26  7:37 ` [PATCH v6 07/18] drm/i915/hdcp: HDCP stream encryption support Anshuman Gupta
2020-11-26  7:37   ` [Intel-gfx] " Anshuman Gupta
2020-11-26  7:37 ` [PATCH v6 08/18] drm/i915/hdcp: Enable HDCP 1.4 stream encryption Anshuman Gupta
2020-11-26  7:37   ` [Intel-gfx] " Anshuman Gupta
2020-11-26  7:37 ` [PATCH v6 09/18] drm/i915/hdcp: Enable Gen12 HDCP 1.4 DP MST support Anshuman Gupta
2020-11-26  7:37   ` [Intel-gfx] " Anshuman Gupta
2020-11-26  7:37 ` [PATCH v6 10/18] drm/i915/hdcp: Pass dig_port to intel_hdcp_init Anshuman Gupta
2020-11-26  7:37   ` [Intel-gfx] " Anshuman Gupta
2020-11-26  7:37 ` [PATCH v6 11/18] drm/i915/hdcp: Encapsulate hdcp_port_data to dig_port Anshuman Gupta
2020-11-26  7:37   ` [Intel-gfx] " Anshuman Gupta
2020-11-26  7:37 ` [PATCH v6 12/18] misc/mei/hdcp: Fix AUTH_STREAM_REQ cmd buffer len Anshuman Gupta
2020-11-26  7:37   ` [Intel-gfx] " Anshuman Gupta
2020-11-26  7:37 ` [PATCH v6 13/18] drm/hdcp: Max MST content streams Anshuman Gupta
2020-11-26  7:37   ` [Intel-gfx] " Anshuman Gupta
2020-11-26  7:37 ` [PATCH v6 14/18] drm/i915/hdcp: MST streams support in hdcp port_data Anshuman Gupta
2020-11-26  7:37   ` [Intel-gfx] " Anshuman Gupta
2020-11-26  7:37 ` Anshuman Gupta [this message]
2020-11-26  7:37   ` [Intel-gfx] [PATCH v6 15/18] drm/i915/hdcp: Pass connector to check_2_2_link Anshuman Gupta
2020-11-26  7:37 ` [PATCH v6 16/18] drm/i915/hdcp: Add HDCP 2.2 stream register Anshuman Gupta
2020-11-26  7:37   ` [Intel-gfx] " Anshuman Gupta
2020-11-26  7:37 ` [PATCH v6 17/18] drm/i915/hdcp: Support for HDCP 2.2 MST shim callbacks Anshuman Gupta
2020-11-26  7:37   ` [Intel-gfx] " Anshuman Gupta
2020-11-26  7:37 ` [PATCH v6 18/18] drm/i915/hdcp: Enable HDCP 2.2 MST support Anshuman Gupta
2020-11-26  7:37   ` [Intel-gfx] " Anshuman Gupta
2020-11-26 10:15 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for HDCP 2.2 and HDCP 1.4 Gen12 DP MST support (rev5) Patchwork
2020-11-26 10:17 ` [Intel-gfx] ✗ Fi.CI.SPARSE: " Patchwork
2020-11-26 10:46 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
2020-11-26 12:58 ` [Intel-gfx] ✗ Fi.CI.IGT: failure " Patchwork
2020-11-27  5:36 ` [Intel-gfx] [PATCH v6 00/18] HDCP 2.2 and HDCP 1.4 Gen12 DP MST support Karthik B S
2020-11-27  5:36   ` Karthik B S

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=20201126073722.19107-16-anshuman.gupta@intel.com \
    --to=anshuman.gupta@intel.com \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=intel-gfx@lists.freedesktop.org \
    --cc=jani.nikula@intel.com \
    --cc=juston.li@intel.com \
    --cc=karthik.b.s@intel.com \
    --cc=seanpaul@chromium.org \
    --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.