drm/amdkfd: Extend gfx12 trap handler fix to gfx10/11

Browse source

In commit fda812ebe3 ("drm/amdkfd: gfx12 context save/restore trap handler fixes")
the following fix was introduced but incorrectly restricted to gfx12.
The same issue and a corresponding fix apply to gfx10 and gfx11.

Do not overwrite TRAPSTS.{SAVECTX,HOST_TRAP} when restoring this
register. Both of these fields can assert while the wavefront is
running the trap handler.

Signed-off-by: Jay Cornwall <jay.cornwall@amd.com>
Reviewed-by: Lancelot Six <lancelot.six@amd.com>
Acked-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

...

This commit is contained in:

Jay Cornwall 2024-06-05 14:27:49 -05:00 • committed by Alex Deucher

parent 020ceface2

commit ec14eab37d

2 changed files with 38 additions and 16 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

16

drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler.h

View file

38

drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler_gfx10.asm

View file