drm/amdgpu: move userq fence wait out of signalling section

Browse source

The eviction fence suspend worker waits for every pending userq fence
from inside a dma_fence_begin_signalling() critical section. Waiting on
another DMA fence while responsible for signalling one violates the
cross-driver fence contract and is reported by lockdep as a
dma_fence_map dependency.

Move the wait before dma_fence_begin_signalling(). Keep userq_mutex held
so queue lifetime remains stable while inspecting last_fence.

Fixes: fc61df1516 ("drm/amdgpu: annotate eviction fence signaling path")
Signed-off-by: Prike Liang <Prike.Liang@amd.com>
Reviewed-by: Vitaly Prosyak <vitaly.prosyak@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
(cherry picked from commit 3bd4fbc5ed)
Cc: stable@vger.kernel.org

...

This commit is contained in:

Prike Liang 2026-07-31 11:44:37 +08:00 • committed by Alex Deucher

parent c5fd4eaad5

commit 3022bdfe3e

3 changed files with 5 additions and 3 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

3

drivers/gpu/drm/amd/amdgpu/amdgpu_eviction_fence.c

View file

4

drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c

View file

1

drivers/gpu/drm/amd/amdgpu/amdgpu_userq.h

View file