Thanks! Applied to -next On Thu, Nov 2, 2017 at 1:21 AM, Felix Kuehling <Felix.Kuehling at amd.com> wrote: > Another pass through a diff between our internal branch and upstream > yielded a few more fixes and cleanups that were previously missed. > > v2: Added a fix for a bug found when syncing upstreamed changes back > into our internal branch (Update queue_count before mapping queues). > Remove a redundant condition (Minor cleanups v2). > > v3: Fixed locking order in "Fix debug unregister procedure on process > termination". > > Ben Goz (1): > drm/amdkfd: Register/Deregister process on qpd resolution > > Felix Kuehling (2): > drm/amdkfd: Update queue_count before mapping queues > drm/amdkfd: Minor cleanups v2 > > Jay Cornwall (1): > drm/amdkfd: Disable CP/SDMA ring/doorbell in MQD > > Yair Shachar (1): > drm/amdkfd: Fix debug unregister procedure on process termination v2 > > Yong Zhao (3): > drm/amdkfd: Clean up the data structure in kfd_process > drm/amdkfd: Avoid calling amd_iommu_unbind_pasid() when suspending > drm/amdkfd: Cleanup DQM ASIC-specific ops > > drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 4 +- > .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 49 +++++++-------- > .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.h | 11 ++-- > .../drm/amd/amdkfd/kfd_device_queue_manager_cik.c | 20 +++--- > .../drm/amd/amdkfd/kfd_device_queue_manager_vi.c | 20 +++--- > drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_cik.c | 34 +++-------- > drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_vi.c | 7 +-- > drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 8 +-- > drivers/gpu/drm/amd/amdkfd/kfd_process.c | 71 ++++++++++------------ > .../gpu/drm/amd/amdkfd/kfd_process_queue_manager.c | 9 ++- > 10 files changed, 96 insertions(+), 137 deletions(-) > > -- > 2.7.4 >