[PATCH v2 13/21] drm/i915/dp: Use check link state work in the HPD IRQ handler

[Imre Deak]

Simplify things by retraining a DP link if a bad link is detected in the
HPD IRQ handler from the encoder's check link state work, similarly to
how this is done after a modeset link training failure.

Signed-off-by: Imre Deak <imre.d...@intel.com>
---
 drivers/gpu/drm/i915/display/intel_dp.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_dp.c 
b/drivers/gpu/drm/i915/display/intel_dp.c
index 70b00e5ae7ad7..b72dbd7becb74 100644
--- a/drivers/gpu/drm/i915/display/intel_dp.c
+++ b/drivers/gpu/drm/i915/display/intel_dp.c
@@ -4950,6 +4950,7 @@ static bool
 intel_dp_check_mst_status(struct intel_dp *intel_dp)
 {
        struct drm_i915_private *i915 = dp_to_i915(intel_dp);
+       struct intel_digital_port *dig_port = dp_to_dig_port(intel_dp);
        bool link_ok = true;
        bool reprobe_needed = false;
 
@@ -4995,7 +4996,10 @@ intel_dp_check_mst_status(struct intel_dp *intel_dp)
                        drm_dp_mst_hpd_irq_send_new_request(&intel_dp->mst_mgr);
        }
 
-       return link_ok && !reprobe_needed;
+       if (!link_ok)
+               intel_ddi_queue_link_check(dig_port, 0);
+
+       return !reprobe_needed;
 }
 
 static void
@@ -5453,9 +5457,7 @@ intel_dp_short_pulse(struct intel_dp *intel_dp)
        /* Handle CEC interrupts, if any */
        drm_dp_cec_irq(&intel_dp->aux);
 
-       /* defer to the hotplug work for link retraining if needed */
-       if (intel_dp_needs_link_retrain(intel_dp))
-               return false;
+       intel_dp_check_link_state(intel_dp);
 
        intel_psr_short_pulse(intel_dp);
 
-- 
2.43.3