diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3393-drm-amdkfd-Use-ASIC-specific-SDMA-MQD-type.patch')
| -rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3393-drm-amdkfd-Use-ASIC-specific-SDMA-MQD-type.patch | 78 |
1 files changed, 78 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3393-drm-amdkfd-Use-ASIC-specific-SDMA-MQD-type.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3393-drm-amdkfd-Use-ASIC-specific-SDMA-MQD-type.patch new file mode 100644 index 00000000..dfbfdb80 --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3393-drm-amdkfd-Use-ASIC-specific-SDMA-MQD-type.patch @@ -0,0 +1,78 @@ +From f67febdbb28828f712fc84ab54a0de0914be0491 Mon Sep 17 00:00:00 2001 +From: Felix Kuehling <Felix.Kuehling@amd.com> +Date: Wed, 1 Nov 2017 19:22:01 -0400 +Subject: [PATCH 3393/4131] drm/amdkfd: Use ASIC-specific SDMA MQD type + +Signed-off-by: shaoyun liu <shaoyun.liu@amd.com> +Signed-off-by: Felix Kuehling <Felix.Kuehling@amd.com> +Reviewed-by: Oded Gabbay <oded.gabbay@gmail.com> +Signed-off-by: Oded Gabbay <oded.gabbay@gmail.com> +--- + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_cik.c | 13 +++++-------- + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_vi.c | 5 +++++ + drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 2 -- + 3 files changed, 10 insertions(+), 10 deletions(-) + +diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_cik.c b/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_cik.c +index ea02bfa..9873929 100644 +--- a/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_cik.c ++++ b/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_cik.c +@@ -36,6 +36,11 @@ static inline struct cik_mqd *get_mqd(void *mqd) + return (struct cik_mqd *)mqd; + } + ++static inline struct cik_sdma_rlc_registers *get_sdma_mqd(void *mqd) ++{ ++ return (struct cik_sdma_rlc_registers *)mqd; ++} ++ + static int init_mqd(struct mqd_manager *mm, void **mqd, + struct kfd_mem_obj **mqd_mem_obj, uint64_t *gart_addr, + struct queue_properties *q) +@@ -362,14 +367,6 @@ static int update_mqd_hiq(struct mqd_manager *mm, void *mqd, + return 0; + } + +-struct cik_sdma_rlc_registers *get_sdma_mqd(void *mqd) +-{ +- struct cik_sdma_rlc_registers *m; +- +- m = (struct cik_sdma_rlc_registers *)mqd; +- +- return m; +-} + + struct mqd_manager *mqd_manager_init_cik(enum KFD_MQD_TYPE type, + struct kfd_dev *dev) +diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_vi.c b/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_vi.c +index 4ea854f..dc92497 100644 +--- a/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_vi.c ++++ b/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_vi.c +@@ -38,6 +38,11 @@ static inline struct vi_mqd *get_mqd(void *mqd) + return (struct vi_mqd *)mqd; + } + ++static inline struct vi_sdma_mqd *get_sdma_mqd(void *mqd) ++{ ++ return (struct vi_sdma_mqd *)mqd; ++} ++ + static int init_mqd(struct mqd_manager *mm, void **mqd, + struct kfd_mem_obj **mqd_mem_obj, uint64_t *gart_addr, + struct queue_properties *q) +diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_priv.h b/drivers/gpu/drm/amd/amdkfd/kfd_priv.h +index 9e4134c..4750473 100644 +--- a/drivers/gpu/drm/amd/amdkfd/kfd_priv.h ++++ b/drivers/gpu/drm/amd/amdkfd/kfd_priv.h +@@ -643,8 +643,6 @@ int kgd2kfd_resume(struct kfd_dev *kfd); + int kfd_init_apertures(struct kfd_process *process); + + /* Queue Context Management */ +-struct cik_sdma_rlc_registers *get_sdma_mqd(void *mqd); +- + int init_queue(struct queue **q, const struct queue_properties *properties); + void uninit_queue(struct queue *q); + void print_queue_properties(struct queue_properties *q); +-- +2.7.4 + |