| Message ID | 20240127071640.850392-4-suraj.kandpal@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | HDCP Type1 MST fixes | expand |
On 1/27/2024 12:46 PM, Suraj Kandpal wrote: > Now that we have moved back to direct reads the additional timing > is not required hence this can be removed. > > Signed-off-by: Suraj Kandpal <suraj.kandpal@intel.com> Add fixes tag. With that, this is: 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 4979c9e25cf0..21c503566fdd 100644 > --- a/drivers/gpu/drm/i915/display/intel_dp_hdcp.c > +++ b/drivers/gpu/drm/i915/display/intel_dp_hdcp.c > @@ -549,13 +549,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,
diff --git a/drivers/gpu/drm/i915/display/intel_dp_hdcp.c b/drivers/gpu/drm/i915/display/intel_dp_hdcp.c index 4979c9e25cf0..21c503566fdd 100644 --- a/drivers/gpu/drm/i915/display/intel_dp_hdcp.c +++ b/drivers/gpu/drm/i915/display/intel_dp_hdcp.c @@ -549,13 +549,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,
Now that we have moved back to direct reads the additional timing is not required hence this can be removed. Signed-off-by: Suraj Kandpal <suraj.kandpal@intel.com> --- drivers/gpu/drm/i915/display/intel_dp_hdcp.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-)