drm/amdgpu/sdma: Fix executing duplicate commands after recovery on SDMA v4.4.2

Browse source

SDMA v4.4.2 had a custom recovery implementation that
tried to keep ring contents and restore the rptr after
an SDMA soft reset. Later it was changed to use the
more common amdgpu_sdma_reset_engine() implementation.

Currently, SDMA v4.4.2 may execute some commands twice
after a recovery:

1. From the old ring buffer contents at the restored rptr
2. From the contents restored by amdgpu_sdma_reset_engine()
   that calls the ring reset helper functions.

Fix that by removing the code that restores rptr.
This is not needed anymore because amdgpu_sdma_reset_engine()
already saves and restores the contents of both the SDMA gfx
and paging rings, so there is no need to do anything extra.

Signed-off-by: Timur Kristóf <timur.kristof@gmail.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

...

This commit is contained in:

Timur Kristóf 2026-09-08 20:10:46 +02:00 • committed by Alex Deucher

parent 5992cc6811

commit 0518c66cf8

3 changed files with 14 additions and 66 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

2

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

View file

2

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

View file

76

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

View file