Skip to content

Commit 20dfa63

Browse files
surajk8jlahtine-intel
authored andcommitted
drm/i915/hdcp: Remove additional timing for reading mst hdcp message
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: 3974f9c ("drm/i915/hdcp: Adjust timeout for read in DPMST Scenario") Signed-off-by: Suraj Kandpal <[email protected]> Reviewed-by: Ankit Nautiyal <[email protected]> Signed-off-by: Ankit Nautiyal <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected] (cherry picked from commit 429ccbd) Signed-off-by: Joonas Lahtinen <[email protected]>
1 parent cb2b7d6 commit 20dfa63

File tree

1 file changed

+2
-7
lines changed

1 file changed

+2
-7
lines changed

drivers/gpu/drm/i915/display/intel_dp_hdcp.c

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -549,13 +549,8 @@ int intel_dp_hdcp2_read_msg(struct intel_connector *connector,
549549

550550
/* Entire msg read timeout since initiate of msg read */
551551
if (bytes_to_recv == size - 1 && hdcp2_msg_data->msg_read_timeout > 0) {
552-
if (intel_encoder_is_mst(connector->encoder))
553-
msg_end = ktime_add_ms(ktime_get_raw(),
554-
hdcp2_msg_data->msg_read_timeout *
555-
connector->port->parent->num_ports);
556-
else
557-
msg_end = ktime_add_ms(ktime_get_raw(),
558-
hdcp2_msg_data->msg_read_timeout);
552+
msg_end = ktime_add_ms(ktime_get_raw(),
553+
hdcp2_msg_data->msg_read_timeout);
559554
}
560555

561556
ret = drm_dp_dpcd_read(aux, offset,

0 commit comments

Comments
 (0)