From: Suraj Kandpal <suraj.kandpal@intel.com>
To: intel-gfx@lists.freedesktop.org
Cc: Jani Nikula <jani.nikula@intel.com>
Subject: [Intel-gfx] [PATCH v4 2/4] drm/i915/hdcp: Remove enforce_type0 check outside loop
Date: Mon, 15 May 2023 16:02:23 +0530 [thread overview]
Message-ID: <20230515103225.688830-3-suraj.kandpal@intel.com> (raw)
In-Reply-To: <20230515103225.688830-1-suraj.kandpal@intel.com>
Remove enforce_type0 check outside the loop since it
does not make sense to keep it there as we use the same
digport and continue checking it again and again
Cc: Ankit Nautiyal <ankit.k.nautiyal@intel.com>
Signed-off-by: Suraj Kandpal <suraj.kandpal@intel.com>
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
---
drivers/gpu/drm/i915/display/intel_hdcp.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_hdcp.c b/drivers/gpu/drm/i915/display/intel_hdcp.c
index e2c5781ad0ab..f2d258a72c59 100644
--- a/drivers/gpu/drm/i915/display/intel_hdcp.c
+++ b/drivers/gpu/drm/i915/display/intel_hdcp.c
@@ -84,6 +84,9 @@ intel_hdcp_required_content_stream(struct intel_digital_port *dig_port)
if (dig_port->hdcp_auth_status)
return 0;
+ if (!dig_port->hdcp_mst_type1_capable)
+ enforce_type0 = true;
+
drm_connector_list_iter_begin(&i915->drm, &conn_iter);
for_each_intel_connector_iter(connector, &conn_iter) {
if (connector->base.status == connector_status_disconnected)
@@ -96,9 +99,6 @@ intel_hdcp_required_content_stream(struct intel_digital_port *dig_port)
if (conn_dig_port != dig_port)
continue;
- if (!enforce_type0 && !dig_port->hdcp_mst_type1_capable)
- enforce_type0 = true;
-
data->streams[data->k].stream_id = intel_conn_to_vcpi(connector);
data->k++;
--
2.25.1
next prev parent reply other threads:[~2023-05-15 10:34 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-15 10:32 [Intel-gfx] [PATCH v4 0/4] Fix modeset locking issue in HDCP MST Suraj Kandpal
2023-05-15 10:32 ` [Intel-gfx] [PATCH v4 1/4] drm/i915/hdcp: add intel_atomic_state argument to hdcp_enable function Suraj Kandpal
2023-05-15 10:32 ` Suraj Kandpal [this message]
2023-05-15 10:32 ` [Intel-gfx] [PATCH v4 3/4] drm/i915/hdcp: Fix modeset locking issue in hdcp mst Suraj Kandpal
2023-05-15 11:20 ` Nautiyal, Ankit K
2023-05-15 10:32 ` [Intel-gfx] [PATCH v4 4/4] drm/i915/hdcp: Fill hdcp2_streamid_type and k in appropriate places Suraj Kandpal
2023-05-15 11:22 ` Nautiyal, Ankit K
2023-05-15 11:27 ` [Intel-gfx] [PATCH v5 " Suraj Kandpal
2023-05-15 22:32 ` [Intel-gfx] ✗ Fi.CI.SPARSE: warning for Fix modeset locking issue in HDCP MST (rev5) Patchwork
2023-05-15 22:51 ` [Intel-gfx] ✗ Fi.CI.BAT: failure " Patchwork
2023-05-16 7:32 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
2023-05-16 7:38 ` Patchwork
2023-05-16 9:44 ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork
2023-05-16 9:59 ` Patchwork
2023-05-16 11:37 ` [Intel-gfx] [PATCH v4 0/4] Fix modeset locking issue in HDCP MST Manna, Animesh
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=20230515103225.688830-3-suraj.kandpal@intel.com \
--to=suraj.kandpal@intel.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=jani.nikula@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