diff options
| author | Imre Deak <imre.deak@intel.com> | 2026-02-18 12:57:08 +0200 |
|---|---|---|
| committer | Imre Deak <imre.deak@intel.com> | 2026-02-19 10:00:48 +0200 |
| commit | 84fa9532c66a58dc76fa2d4d2ea5e0034871111b (patch) | |
| tree | b38586164272a073e605a7f22d0a0a860d4b0ac1 /drivers/gpu | |
| parent | c860076ea9b56032dd31c0a5560bba45637e4264 (diff) | |
| download | linux-84fa9532c66a58dc76fa2d4d2ea5e0034871111b.tar.gz linux-84fa9532c66a58dc76fa2d4d2ea5e0034871111b.zip | |
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 <ankit.k.nautiyal@intel.com>
Fixes: b506a8e18c972 ("drm/i915/dp_mst: 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-2-imre.deak@intel.com
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_dp_mst.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/display/intel_dp_mst.c b/drivers/gpu/drm/i915/display/intel_dp_mst.c index f833f4764327..94c023142664 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; } |