diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c
index 454e6144ee4e..025e906b63a9 100644
--- a/drivers/gpu/drm/i915/display/intel_dp.c
+++ b/drivers/gpu/drm/i915/display/intel_dp.c
@@ -2969,7 +2969,7 @@ intel_dp_compute_link_config(struct intel_encoder *encoder,
 
 		ret = intel_dp_compute_link_for_joined_pipes(encoder, crtc_state, conn_state,
 							     respect_downstream_limits);
-		if (ret == 0)
+		if (ret == 0 || ret == -EDEADLK)
 			break;
 	}