]> www.infradead.org Git - users/jedix/linux-maple.git/commit
drm/amdkfd: Extend gfx12 trap handler fix to gfx10/11
authorJay Cornwall <jay.cornwall@amd.com>
Wed, 5 Jun 2024 19:27:49 +0000 (14:27 -0500)
committerAlex Deucher <alexander.deucher@amd.com>
Fri, 14 Jun 2024 20:17:15 +0000 (16:17 -0400)
commitec14eab37dbb07b92e2079c9b7ef4730d9418f89
tree2e76aa33c4a92bb9a023bd97bc3f3355ed002e0d
parent020ceface29f7280dcccc866b106ba4e9ecd6c8c
drm/amdkfd: Extend gfx12 trap handler fix to gfx10/11

In commit fda812ebe3d9 ("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>
drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler.h
drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler_gfx10.asm