Fix a broken merge and upstream missing gfx12.1 changes.

Jay Cornwall (4):
  drm/amdkfd: Sync trap handler binary with source
  drm/amdkfd: Fix scalar load ordering in gfx12.1 trap handler
  drm/amdkfd: gfx12.1 cluster barrier context save workaround
  drm/amdkfd: gfx12.1 trap handler support for expert scheduling mode

Lancelot Six (1):
  drm/amdkfd: Do not include VGPR MSBs in saved PC during save

 .../gpu/drm/amd/amdkfd/cwsr_trap_handler.h    | 1435 ++++++++---------
 .../amd/amdkfd/cwsr_trap_handler_gfx12.asm    |   73 +-
 2 files changed, 744 insertions(+), 764 deletions(-)

-- 
2.34.1

Reply via email to