These are some random patches I noticed when comparing amdkfd-next against amd-kfd-staging. Ben Goz (1): drm/amdkfd: Locking PM mutex while allocating IB buffer Felix Kuehling (4): drm/amdkfd: Remove redundant include of amd-iommu.h drm/amdkfd: Fix signal handling performance again drm/amdkfd: Remove initialization of cp_hqd_ib_control on CIK drm/amdkfd: Add sanity checks in IRQ handlers Jay Cornwall (2): drm/amdkfd: Reduce priority of context-saving waves before spin-wait drm/amdkfd: Use volatile MTYPE in default/alternate apertures Oak Zeng (1): drm/amdkfd: Dump HQD of HIQ Philip Yang (1): drm/amdkfd: use %px to print user space address instead of %p Shaoyun Liu (1): drm/amdkfd: Remove queue node when destroy queue failed Yong Zhao (2): drm/amdkfd: Separate trap handler assembly code and its hex values drm/amdkfd: Fix CP soft hang on APUs drivers/gpu/drm/amd/amdkfd/cik_event_interrupt.c | 20 +- drivers/gpu/drm/amd/amdkfd/cik_regs.h | 3 +- drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler.h | 560 +++++++++++++++++++++ .../gpu/drm/amd/amdkfd/cwsr_trap_handler_gfx8.asm | 274 +--------- .../gpu/drm/amd/amdkfd/cwsr_trap_handler_gfx9.asm | 307 +---------- drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 2 +- drivers/gpu/drm/amd/amdkfd/kfd_device.c | 6 +- .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 12 + drivers/gpu/drm/amd/amdkfd/kfd_events.c | 2 +- drivers/gpu/drm/amd/amdkfd/kfd_int_process_v9.c | 40 +- drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_cik.c | 4 - drivers/gpu/drm/amd/amdkfd/kfd_packet_manager.c | 7 +- .../gpu/drm/amd/amdkfd/kfd_process_queue_manager.c | 10 +- drivers/gpu/drm/amd/amdkfd/kfd_queue.c | 8 +- 14 files changed, 659 insertions(+), 596 deletions(-) create mode 100644 drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler.h -- 2.7.4