intel_dp_link_caps_update(reset=true) is already called prior to intel_dp_reset_link_params(), making the explicit call to intel_dp_link_caps_reset() redundant. Remove it as requested by the existing TODO comment to clean up the link parameter reset flow.
Signed-off-by: George Karagounis <[email protected]> --- drivers/gpu/drm/i915/display/intel_dp.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c index d8c0d9381471..0e753824bc28 100644 --- a/drivers/gpu/drm/i915/display/intel_dp.c +++ b/drivers/gpu/drm/i915/display/intel_dp.c @@ -3674,17 +3674,10 @@ void intel_dp_set_link_params(struct intel_dp *intel_dp, void intel_dp_reset_link_params(struct intel_dp *intel_dp) { - /* - * TODO: Remove the following reset of link capabilities, as - * this isn't needed after intel_dp_link_caps_update(reset=true) - * was called. - */ - intel_dp_link_caps_reset(intel_dp->link.caps); - intel_dp_tunnel_uhbr_lanes_wa_apply(intel_dp); - - intel_dp->link.mst_probed_lane_count = 0; - intel_dp->link.mst_probed_rate = 0; - intel_dp_link_training_reset(intel_dp->link.training); + intel_dp_tunnel_uhbr_lanes_wa_apply(intel_dp); + intel_dp->link.mst_probed_lane_count = 0; + intel_dp->link.mst_probed_rate = 0; + intel_dp_link_training_reset(intel_dp->link.training); } /* Enable backlight PWM and backlight PP control. */ -- 2.56.0
