From: Imre Deak Date: Wed, 18 Feb 2026 10:57:08 +0000 (+0200) Subject: drm/i915/dp_mst: Fix ww mutex lock failure in for_each_joiner_candidate() loop X-Git-Tag: v7.1-rc1~167^2~24^2~131 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=84fa9532c66a58dc76fa2d4d2ea5e0034871111b;p=thirdparty%2Flinux.git drm/i915/dp_mst: 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: b506a8e18c972 ("drm/i915/dp_mst: Rework pipe joiner logic in compute_config") Reviewed-by: Ankit Nautiyal Signed-off-by: Imre Deak Link: https://patch.msgid.link/20260218105708.845161-2-imre.deak@intel.com --- diff --git a/drivers/gpu/drm/i915/display/intel_dp_mst.c b/drivers/gpu/drm/i915/display/intel_dp_mst.c index f833f47643271..94c0231426642 100644 --- a/drivers/gpu/drm/i915/display/intel_dp_mst.c +++ b/drivers/gpu/drm/i915/display/intel_dp_mst.c @@ -729,7 +729,7 @@ static int mst_stream_compute_config(struct intel_encoder *encoder, pipe_config, conn_state, num_joined_pipes); - if (ret == 0) + if (ret == 0 || ret == -EDEADLK) break; }