Hi Dave, Another pull request for 3.20. drm-amdkfd-next-2015-01-21: - Infrastructure work in amdkfd to prepare for VI support. This work mainly includes separating modules into ASIC-specific functionality, adding new properties that are relevant for VI, making sure that shared code is reused, etc. - Improve mechanism of submitting packets to HIQ (the kernel queue that amdkfd uses to issue commands to the GPU). The driver used to verify that each CS was read by the GPU. However, this proved to be both unnecessary and erroneous. Therefore, we cancelled this verification. - Moved initialization of compute VMIDs into radeon driver - Various minor fixes Thanks, Oded The following changes since commit fc83975348ebce07793e6b9f780edc3cbcffa9fc: Merge tag 'imx-drm-next-2015-01-09' of git://git.pengutronix.de/git/pza/linux into drm-next (2015-01-21 10:17:16 +1000) are available in the git repository at: git://people.freedesktop.org/~gabbayo/linux tags/drm-amdkfd-next-2015-01-21 for you to fetch changes up to cb2ac441289fbd4fc7fe98180d9413f3e86b2ddf: drm/amdkfd: Fix description of sched_policy module parameter (2015-01-18 13:18:01 +0200) ---------------------------------------------------------------- Ben Goz (12): drm/radeon: Initialize compute vmid drm/amdkfd: Remove call to deprecated init_memory interface 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 drm/amdkfd: Fix logic of destroy_queue_nocpsch() drm/amdkfd: Add initial VI support for DQM drm/amdkfd: Add initial VI support for KQ drm/amdkfd: Fix for-loop when allocating HQD (non-HWS) drm/amdkfd: Fix description of sched_policy module parameter Oded Gabbay (10): drm/radeon: Don't use relative paths in #include drm/amdkfd: Don't include header files from radeon drm/radeon: Use new cik_structs.h file MAINTAINERS: Update amdkfd files drm/amdkfd: Don't BUG on freeing GART sub-allocation drm/amdkfd: Encapsulate DQM functions in ops structure drm/amdkfd: Encapsulate KQ functions in ops structure drm/amdkfd: Replace cpu_relax() with schedule() in DQM drm/amdkfd: Remove unused function busy_wait() drm/amdkfd: Remove sync_with_hw() from amdkfd MAINTAINERS | 2 + drivers/gpu/drm/amd/amdkfd/Makefile | 5 +- drivers/gpu/drm/amd/amdkfd/cik_regs.h | 13 + drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 33 +- drivers/gpu/drm/amd/amdkfd/kfd_device.c | 21 +- .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 248 ++++-------- .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.h | 36 +- .../drm/amd/amdkfd/kfd_device_queue_manager_cik.c | 135 +++++++ .../drm/amd/amdkfd/kfd_device_queue_manager_vi.c | 64 +++ drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.c | 67 ++- drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.h | 40 +- drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue_cik.c | 44 ++ drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue_vi.c | 56 +++ drivers/gpu/drm/amd/amdkfd/kfd_module.c | 2 +- drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.c | 435 +------------------- drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_cik.c | 448 +++++++++++++++++++++ drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_vi.c | 33 ++ drivers/gpu/drm/amd/amdkfd/kfd_packet_manager.c | 22 +- drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 23 +- .../gpu/drm/amd/amdkfd/kfd_process_queue_manager.c | 16 +- drivers/gpu/drm/amd/include/cik_structs.h | 293 ++++++++++++++ drivers/gpu/drm/amd/include/kgd_kfd_interface.h | 4 - drivers/gpu/drm/radeon/Makefile | 2 +- drivers/gpu/drm/radeon/cik.c | 24 ++ drivers/gpu/drm/radeon/cik_reg.h | 264 ------------ drivers/gpu/drm/radeon/radeon_kfd.c | 40 +- drivers/gpu/drm/radeon/radeon_kfd.h | 2 +- 27 files changed, 1387 insertions(+), 985 deletions(-) create mode 100644 drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager_cik.c create mode 100644 drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager_vi.c create mode 100644 drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue_cik.c create mode 100644 drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue_vi.c 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 _______________________________________________ dri-devel mailing list dri-devel@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/dri-devel