Skip to content

Commit 9eb00b5

Browse files
rbmcv73alexdeucher
authored andcommitted
drm/radeon: delete radeon_fence_process in is_signaled, no deadlock
Delete the attempt to progress the queue when checking if fence is signaled. This avoids deadlock. dma-fence_ops::signaled can be called with the fence lock in unknown state. For radeon, the fence lock is also the wait queue lock. This can cause a self deadlock when signaled() tries to make forward progress on the wait queue. But advancing the queue is unneeded because incorrectly returning false from signaled() is perfectly acceptable. Link: brave/brave-browser#49182 Closes: https://gitlab.freedesktop.org/drm/amd/-/issues/4641 Cc: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Robert McClinton <rbmccav@gmail.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com> (cherry picked from commit 527ba26) Cc: stable@vger.kernel.org
1 parent 1788ef3 commit 9eb00b5

1 file changed

Lines changed: 0 additions & 7 deletions

File tree

drivers/gpu/drm/radeon/radeon_fence.c

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -360,13 +360,6 @@ static bool radeon_fence_is_signaled(struct dma_fence *f)
360360
if (atomic64_read(&rdev->fence_drv[ring].last_seq) >= seq)
361361
return true;
362362

363-
if (down_read_trylock(&rdev->exclusive_lock)) {
364-
radeon_fence_process(rdev, ring);
365-
up_read(&rdev->exclusive_lock);
366-
367-
if (atomic64_read(&rdev->fence_drv[ring].last_seq) >= seq)
368-
return true;
369-
}
370363
return false;
371364
}
372365

0 commit comments

Comments
 (0)