From: Imre Deak Date: Wed, 25 Feb 2026 16:46:16 +0000 (+0200) Subject: drm/i915/dp_mst: Reuse intel_dp_handle_link_service_irq() X-Git-Tag: v7.1-rc1~167^2~24^2~56 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0f3675d6472218fdde3e6682ab1ad59618a63e83;p=thirdparty%2Flinux.git drm/i915/dp_mst: Reuse intel_dp_handle_link_service_irq() Use intel_dp_handle_link_service_irq() while handling an MST HPD IRQ, instead of open-coding this. Reviewed-by: Luca Coelho Signed-off-by: Imre Deak Link: https://patch.msgid.link/20260225164618.1261368-19-imre.deak@intel.com --- diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c index 9a75f4a9b339b..413d6872812b2 100644 --- a/drivers/gpu/drm/i915/display/intel_dp.c +++ b/drivers/gpu/drm/i915/display/intel_dp.c @@ -5527,6 +5527,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 @@ -5574,14 +5576,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; } @@ -5884,7 +5879,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)