From c860076ea9b56032dd31c0a5560bba45637e4264 Mon Sep 17 00:00:00 2001 From: Imre Deak Date: Wed, 18 Feb 2026 12:57:07 +0200 Subject: [PATCH] drm/i915/dp: Fix ww mutex lock failure in for_each_joiner_candidate() loop Handle modeset WW mutex lock failures due to contention properly. Return -EDEADLK to the caller instead of attempting to lock the same mutex again in a subsequent joiner candidate iteration, where the WW mutex is already in a contended state. This fixes the following warning: WARNING: drivers/gpu/drm/drm_modeset_lock.c:298 at modeset_lock+0x1c0/0x210 triggered by ctx->contended. Cc: Ankit Nautiyal Fixes: 1f1e3e5c65f6d ("drm/i915/dp: Rework pipe joiner logic in compute_config") Reviewed-by: Ankit Nautiyal Signed-off-by: Imre Deak Link: https://patch.msgid.link/20260218105708.845161-1-imre.deak@intel.com --- drivers/gpu/drm/i915/display/intel_dp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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; }