On Thu, 2025-06-26 at 11:20 +0300, Imre Deak wrote: > From: Imre Deak <imre.d...@gmail.com> > > Use intel_dp_handle_link_service_irq() while handling an MST HPD IRQ, > instead of open-coding this. > > Signed-off-by: Imre Deak <imre.d...@gmail.com> > --- > drivers/gpu/drm/i915/display/intel_dp.c | 13 ++++--------- > 1 file changed, 4 insertions(+), 9 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_dp.c > b/drivers/gpu/drm/i915/display/intel_dp.c > index 000c57da92d60..52249fa5c8a6d 100644 > --- a/drivers/gpu/drm/i915/display/intel_dp.c > +++ b/drivers/gpu/drm/i915/display/intel_dp.c > @@ -5129,6 +5129,8 @@ intel_dp_mst_hpd_irq(struct intel_dp *intel_dp, u8 > *esi, u8 *ack) > } > } > > +static bool intel_dp_handle_link_service_irq(struct intel_dp *intel_dp, u8 > irq_mask); > + > /** > * intel_dp_check_mst_status - service any pending MST interrupts, check > link status > * @intel_dp: Intel DP struct > @@ -5176,14 +5178,7 @@ intel_dp_check_mst_status(struct intel_dp *intel_dp) > if (ack[1] & (DP_DOWN_REP_MSG_RDY | DP_UP_REQ_MSG_RDY)) > drm_dp_mst_hpd_irq_send_new_request(&intel_dp->mst.mgr); > > - if (ack[3] & RX_CAP_CHANGED) > - reprobe_needed = true; > - > - if ((ack[3] & LINK_STATUS_CHANGED) || > intel_dp->link.force_retrain) > - intel_dp_check_link_state(intel_dp); > - > - if ((ack[3] & DP_TUNNELING_IRQ) && > - drm_dp_tunnel_handle_irq(display->dp_tunnel_mgr, > &intel_dp->aux)) > + if (intel_dp_handle_link_service_irq(intel_dp, ack[3])) > reprobe_needed = true; > } > > @@ -5481,7 +5476,7 @@ static bool intel_dp_handle_link_service_irq(struct > intel_dp *intel_dp, u8 irq_m > if (irq_mask & RX_CAP_CHANGED) > reprobe_needed = true; > > - if (irq_mask & LINK_STATUS_CHANGED) > + if ((irq_mask & LINK_STATUS_CHANGED) || intel_dp->link.force_retrain) > intel_dp_check_link_state(intel_dp); > > if (irq_mask & HDMI_LINK_STATUS_CHANGED)
Reviewed-by: Luca Coelho <luciano.coe...@intel.com> -- Cheers, Luca.
