[Intel-gfx] [PATCH] drm/i915: Fix error handling during DPRX link training

Imre Deak imre.deak at intel.com
Tue Oct 27 13:36:00 UTC 2020


Make sure to propagate the error result from the DPRX link training
phase. The lack of this broke the link training fall-back logic if the
link training failed during the DPRX phase.

Fixes: b30edfd8d0b4 ("drm/i915: Switch to LTTPR non-transparent mode link training")
References: https://gitlab.freedesktop.org/drm/intel/-/issues/1378
Reported-by: Jason Andryuk <jandryuk at gmail.com>
Cc: Ville Syrjälä <ville.syrjala at linux.intel.com>
Signed-off-by: Imre Deak <imre.deak at intel.com>
---
 drivers/gpu/drm/i915/display/intel_dp_link_training.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/display/intel_dp_link_training.c b/drivers/gpu/drm/i915/display/intel_dp_link_training.c
index 91d3979902d0..632d0a7d886d 100644
--- a/drivers/gpu/drm/i915/display/intel_dp_link_training.c
+++ b/drivers/gpu/drm/i915/display/intel_dp_link_training.c
@@ -768,7 +768,7 @@ intel_dp_link_train_all_phys(struct intel_dp *intel_dp,
 	}
 
 	if (ret)
-		intel_dp_link_train_phy(intel_dp, crtc_state, DP_PHY_DPRX);
+		ret = intel_dp_link_train_phy(intel_dp, crtc_state, DP_PHY_DPRX);
 
 	if (intel_dp->set_idle_link_train)
 		intel_dp->set_idle_link_train(intel_dp, crtc_state);
-- 
2.25.1



More information about the Intel-gfx mailing list