]> git.ipfire.org Git - thirdparty/linux.git/commit
drm/i915/dp: Fix ww mutex lock failure in for_each_joiner_candidate() loop
authorImre Deak <imre.deak@intel.com>
Wed, 18 Feb 2026 10:57:07 +0000 (12:57 +0200)
committerImre Deak <imre.deak@intel.com>
Thu, 19 Feb 2026 08:00:28 +0000 (10:00 +0200)
commitc860076ea9b56032dd31c0a5560bba45637e4264
tree5c2b27836d46e726d6a7bf7273e58bd1d48cc9bd
parent552399c4350fa818874de97abd943fdbc1ea3a7d
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 <ankit.k.nautiyal@intel.com>
Fixes: 1f1e3e5c65f6d ("drm/i915/dp: Rework pipe joiner logic in compute_config")
Reviewed-by: Ankit Nautiyal <ankit.k.nautiyal@intel.com>
Signed-off-by: Imre Deak <imre.deak@intel.com>
Link: https://patch.msgid.link/20260218105708.845161-1-imre.deak@intel.com
drivers/gpu/drm/i915/display/intel_dp.c