This patch-set starts to prepare amdkfd so it could support VI APU. 1. As newer H/W will be handled by amdgpu, we need to eliminate amdkfd's include of radeon header files. 2. MQDs are different between CI and VI, so we need to split the MQD manager module to CI-specific and VI-specific. 3. Some new fields and enums need to be added to different structures. Note: there is no change in the IOCTLs. Oded Ben Goz (5): drm/amd: Put cik structures in a common place drm/amdkfd: Add new VI-specific queue properties drm/amdkfd: Make KFD_MQD_TYPE enum types H/W agnostic drm/amdkfd: Add asic property to kfd_device_info drm/amdkfd: Change MQD manager to be H/W specific Oded Gabbay (4): drm/radeon: Don't use relative paths in #include drm/radeon: Use new cik_structs.h file drm/amdkfd: Don't include header files from radeon MAINTAINERS: Update amdkfd files MAINTAINERS | 2 + drivers/gpu/drm/amd/amdkfd/Makefile | 1 + drivers/gpu/drm/amd/amdkfd/cik_regs.h | 13 + drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 31 +- drivers/gpu/drm/amd/amdkfd/kfd_device.c | 10 +- .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 15 +- drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.c | 2 +- drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.c | 435 +------------------- drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_cik.c | 454 +++++++++++++++++++++ drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_vi.c | 33 ++ drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 23 +- drivers/gpu/drm/amd/include/cik_structs.h | 293 +++++++++++++ drivers/gpu/drm/radeon/Makefile | 2 +- drivers/gpu/drm/radeon/cik_reg.h | 264 ------------ drivers/gpu/drm/radeon/radeon_kfd.c | 1 + drivers/gpu/drm/radeon/radeon_kfd.h | 2 +- 16 files changed, 871 insertions(+), 710 deletions(-) create mode 100644 drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_cik.c create mode 100644 drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_vi.c create mode 100644 drivers/gpu/drm/amd/include/cik_structs.h -- 1.9.1 _______________________________________________ dri-devel mailing list dri-devel@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/dri-devel