dw_hdmi_qp_rockchip_get_vop_format() calls drm_atomic_get_bridge_state(), which takes the bridge private object lock through the atomic state's ww acquire context and may therefore fail with -EDEADLK when the lock is contended.
The DRM core expects -EDEADLK to be propagated up from atomic_check() so it can drop all held locks and restart the commit. Replacing it with a hardcoded -EINVAL defeats this backoff mechanism, making otherwise valid commits fail spuriously when multiple threads perform atomic commits concurrently. Propagate the error code returned by the helper instead of unnecessarily overriding it. Reported-by: Sashiko <[email protected]> Closes: https://lore.kernel.org/all/[email protected]/ Fixes: a18aa0dd7a0b ("drm/rockchip: dw_hdmi_qp: Implement "color format" DRM property") Signed-off-by: Cristian Ciocaltea <[email protected]> --- drivers/gpu/drm/rockchip/dw_hdmi_qp-rockchip.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/rockchip/dw_hdmi_qp-rockchip.c b/drivers/gpu/drm/rockchip/dw_hdmi_qp-rockchip.c index f2a1ea8dfefa..db1933d75ced 100644 --- a/drivers/gpu/drm/rockchip/dw_hdmi_qp-rockchip.c +++ b/drivers/gpu/drm/rockchip/dw_hdmi_qp-rockchip.c @@ -203,7 +203,7 @@ dw_hdmi_qp_rockchip_encoder_atomic_check(struct drm_encoder *encoder, ingest_fmt = dw_hdmi_qp_rockchip_get_vop_format(encoder, conn_state); if (ingest_fmt < 0) - return -EINVAL; + return ingest_fmt; if (hdmi->tmds_char_rate == conn_state->hdmi.tmds_char_rate && s->output_bpc == conn_state->hdmi.output_bpc && -- 2.55.0
