All of lore.kernel.org
 help / color / mirror / Atom feed
From: Suraj Kandpal <suraj.kandpal@intel.com>
To: intel-gfx@lists.freedesktop.org
Cc: jani.nikula@intel.com, uma.shankar@intel.com,
	ankit.k.nautiyal@intel.com,
	Suraj Kandpal <suraj.kandpal@intel.com>
Subject: [PATCH 08/13] drm/i915/hdcp: Remove additional timing for reading mst hdcp message
Date: Thu, 15 Feb 2024 16:29:14 +0530	[thread overview]
Message-ID: <20240215105919.1439549-9-suraj.kandpal@intel.com> (raw)
In-Reply-To: <20240215105919.1439549-1-suraj.kandpal@intel.com>

Now that we have moved back to direct reads the additional timing
is not required hence this can be removed.

--v2
-Add Fixes tag [Ankit]

Fixes: 3974f9c17bb9 ("drm/i915/hdcp: Adjust timeout for read in DPMST Scenario")
Signed-off-by: Suraj Kandpal <suraj.kandpal@intel.com>
Reviewed-by: Ankit Nautiyal <ankit.k.nautiyal@intel.com>
---
 drivers/gpu/drm/i915/display/intel_dp_hdcp.c | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_dp_hdcp.c b/drivers/gpu/drm/i915/display/intel_dp_hdcp.c
index c32303e7a059..9a82a3a5dfec 100644
--- a/drivers/gpu/drm/i915/display/intel_dp_hdcp.c
+++ b/drivers/gpu/drm/i915/display/intel_dp_hdcp.c
@@ -551,13 +551,8 @@ int intel_dp_hdcp2_read_msg(struct intel_connector *connector,
 
 		/* Entire msg read timeout since initiate of msg read */
 		if (bytes_to_recv == size - 1 && hdcp2_msg_data->msg_read_timeout > 0) {
-			if (intel_encoder_is_mst(connector->encoder))
-				msg_end = ktime_add_ms(ktime_get_raw(),
-						       hdcp2_msg_data->msg_read_timeout *
-						       connector->port->parent->num_ports);
-			else
-				msg_end = ktime_add_ms(ktime_get_raw(),
-						       hdcp2_msg_data->msg_read_timeout);
+			msg_end = ktime_add_ms(ktime_get_raw(),
+					       hdcp2_msg_data->msg_read_timeout);
 		}
 
 		ret = drm_dp_dpcd_read(aux, offset,
-- 
2.25.1


  parent reply	other threads:[~2024-02-15 11:01 UTC|newest]

Thread overview: 28+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-02-15 10:59 [PATCH 00/13] HDCP MST Type1 fixes Suraj Kandpal
2024-02-15 10:59 ` [PATCH 01/13] drm/i915/hdcp: Move to direct reads for HDCP Suraj Kandpal
2024-02-15 10:59 ` [PATCH 02/13] drm/i915/hdcp: Move source hdcp2 checks into its own function Suraj Kandpal
2024-02-15 10:59 ` [PATCH 03/13] drm/i915/hdcp: Refactor intel_dp_hdcp2_capable Suraj Kandpal
2024-02-15 10:59 ` [PATCH 04/13] drm/i915/hdcp: Pass drm_dp_aux to read_bcaps function Suraj Kandpal
2024-02-15 10:59 ` [PATCH 05/13] drm/i915/hdcp: Rename hdcp capable functions Suraj Kandpal
2024-02-19 10:52   ` Nautiyal, Ankit K
2024-02-15 10:59 ` [PATCH 06/13] drm/i915/hdcp: Add new remote capability check shim function Suraj Kandpal
2024-02-15 10:59 ` [PATCH 07/13] drm/i915/hdcp: HDCP Capability for the downstream device Suraj Kandpal
2024-02-15 10:59 ` Suraj Kandpal [this message]
2024-02-15 10:59 ` [PATCH 09/13] drm/i915/hdcp: Extract hdcp structure from correct connector Suraj Kandpal
2024-02-15 10:59 ` [PATCH 10/13] drm/i915/hdcp: Don't enable HDCP2.2 directly from check_link Suraj Kandpal
2024-02-16  3:17   ` Nautiyal, Ankit K
2024-02-15 10:59 ` [PATCH 11/13] drm/i915/hdcp: Don't enable HDCP1.4 " Suraj Kandpal
2024-02-16  3:18   ` Nautiyal, Ankit K
2024-02-15 10:59 ` [PATCH 12/13] drm/i915/hdcp: Allocate stream id after HDCP AKE stage Suraj Kandpal
2024-02-16  3:15   ` Nautiyal, Ankit K
2024-02-20  4:56   ` Suraj Kandpal
2024-02-15 10:59 ` [PATCH 13/13] drm/i915/hdcp: Read Rxcaps for robustibility Suraj Kandpal
2024-02-15 12:16 ` ✗ Fi.CI.SPARSE: warning for HDCP MST Type1 fixes (rev2) Patchwork
2024-02-15 12:26 ` ✓ Fi.CI.BAT: success " Patchwork
2024-02-16  9:26 ` ✗ Fi.CI.IGT: failure " Patchwork
2024-02-20  6:15 ` ✗ Fi.CI.SPARSE: warning for HDCP MST Type1 fixes (rev3) Patchwork
2024-02-20  6:19 ` ✓ Fi.CI.BAT: success " Patchwork
2024-02-20  8:18 ` ✗ Fi.CI.IGT: failure " Patchwork
2024-02-22  6:48 ` ✓ Fi.CI.IGT: success " Patchwork
2024-02-22  7:43 [PATCH 00/13] HDCP MST Type1 fixes Suraj Kandpal
2024-02-22  7:43 ` [PATCH 08/13] drm/i915/hdcp: Remove additional timing for reading mst hdcp message Suraj Kandpal
2024-02-23  8:14 [PATCH 00/13] HDCP MST Type1 fixes Suraj Kandpal
2024-02-23  8:14 ` [PATCH 08/13] drm/i915/hdcp: Remove additional timing for reading mst hdcp message Suraj Kandpal

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=20240215105919.1439549-9-suraj.kandpal@intel.com \
    --to=suraj.kandpal@intel.com \
    --cc=ankit.k.nautiyal@intel.com \
    --cc=intel-gfx@lists.freedesktop.org \
    --cc=jani.nikula@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.