Commit bbe5679f authored by Philipp Stanner's avatar Philipp Stanner Committed by Danilo Krummrich
Browse files

drm/nouveau: Fix WARN_ON in nouveau_fence_context_kill() 



Nouveau is mostly designed in a way that it's expected that fences only
ever get signaled through nouveau_fence_signal(). However, in at least
one other place, nouveau_fence_done(), can signal fences, too. If that
happens (race) a signaled fence remains in the pending list for a while,
until it gets removed by nouveau_fence_update().

Should nouveau_fence_context_kill() run in the meantime, this would be
a bug because the function would attempt to set an error code on an
already signaled fence.

Have nouveau_fence_context_kill() check for a fence being signaled.

Cc: stable@vger.kernel.org # v5.10+
Fixes: ea13e5ab ("drm/nouveau: signal pending fences when channel has been killed")
Suggested-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarPhilipp Stanner <phasta@kernel.org>
Link: https://lore.kernel.org/r/20250415121900.55719-3-phasta@kernel.org


Signed-off-by: default avatarDanilo Krummrich <dakr@kernel.org>
parent 095c8e61

drivers/gpu/drm/nouveau/nouveau_fence.c

+1 −1
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@ nouveau_fence_context_kill(struct nouveau_fence_chan *fctx, int error) 
	while (!list_empty(&fctx->pending)) {

		fence = list_entry(fctx->pending.next, typeof(*fence), head);



		if (error)

		if (error && !dma_fence_is_signaled_locked(&fence->base))

			dma_fence_set_error(&fence->base, error);



		if (nouveau_fence_signal(fence))