drm/amdkfd: Use kernel queue v9 functions for v10
Subsystems (3)
PATCH 1/1 drm/amdkfd: Use kernel queue v9 functions for v10
The kernel queue functions for v9 and v10 are the same except pm_map_process_v* which have small difference, so they should be reused. This eliminates the need of reapplying several patches which were applied on v9 but not on v10, such as bigger GWS and more than 2 SDMA engine support which were introduced on Arcturus.
Change-Id I2d385961e3c884db14e30b5afc98d0d9e4cb1802
Signed-off-by Yong Zhao <[email protected]>
--- drivers/gpu/drm/amd/amdkfd/Makefile | 1 - drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.c | 4 +- drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.h | 1 - .../gpu/drm/amd/amdkfd/kfd_kernel_queue_v10.c | 317 ------------------ .../gpu/drm/amd/amdkfd/kfd_kernel_queue_v9.c | 48 ++- drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 3 - 6 files changed, 43 insertions(+), 331 deletions(-) delete mode 100644 drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue_v10.c
drivers/gpu/drm/amd/amdkfd/Makefile +0 -1
@@ -41,7 +41,6 @@ AMDKFD_FILES := $(AMDKFD_PATH)/kfd_module.o \ $(AMDKFD_PATH)/kfd_kernel_queue_cik.o \ $(AMDKFD_PATH)/kfd_kernel_queue_vi.o \ $(AMDKFD_PATH)/kfd_kernel_queue_v9.o \ - $(AMDKFD_PATH)/kfd_kernel_queue_v10.o \ $(AMDKFD_PATH)/kfd_packet_manager.o \ $(AMDKFD_PATH)/kfd_process_queue_manager.o \ $(AMDKFD_PATH)/kfd_device_queue_manager.o \
drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.c +1 -3
@@ -332,12 +332,10 @@ struct kernel_queue *kernel_queue_init(struct kfd_dev *dev,case CHIP_RAVEN :case CHIP_RENOIR :case CHIP_ARCTURUS : -kernel_queue_init_v9 (&kq->ops_asic_specific); -break ;case CHIP_NAVI10 :case CHIP_NAVI12 :case CHIP_NAVI14 : -kernel_queue_init_v10 (&kq->ops_asic_specific); +kernel_queue_init_v9 (&kq->ops_asic_specific);break ;default : WARN(1, "Unexpected ASIC family %u",
drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.h +0 -1
@@ -102,6 +102,5 @@ struct kernel_queue {void kernel_queue_init_cik (struct kernel_queue_ops *ops);void kernel_queue_init_vi (struct kernel_queue_ops *ops);void kernel_queue_init_v9 (struct kernel_queue_ops *ops); -void kernel_queue_init_v10 (struct kernel_queue_ops *ops);#endif /* KFD_KERNEL_QUEUE_H_ */
drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue_v10.c deleted +0 -317
317 lines not on this page · raw message
drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue_v9.c +42 -6
75 lines not on this page · raw message
drivers/gpu/drm/amd/amdkfd/kfd_priv.h +0 -3
@@ -996,9 +996,6 @@ void pm_release_ib(struct packet_manager *pm);/* Following PM funcs can be shared among VI and AI */ unsigned int pm_build_pm4_header (unsigned int opcode,size_t packet_size); -int pm_set_resources_vi (struct packet_manager *pm,uint32_t *buffer, -struct scheduling_resources *res); -uint64_t kfd_get_number_elems (struct kfd_dev *kfd);
Signature · 6 lines
2.17.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx