diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/4435-drm-amdkfd-Merge-CIK-kernel-queue-functions-into-VI.patch')
| -rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/4435-drm-amdkfd-Merge-CIK-kernel-queue-functions-into-VI.patch | 158 |
1 files changed, 158 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/4435-drm-amdkfd-Merge-CIK-kernel-queue-functions-into-VI.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/4435-drm-amdkfd-Merge-CIK-kernel-queue-functions-into-VI.patch new file mode 100644 index 00000000..67599335 --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/4435-drm-amdkfd-Merge-CIK-kernel-queue-functions-into-VI.patch @@ -0,0 +1,158 @@ +From 51ef2756d9b88b590d80b2fc552a7ea54e65aaa4 Mon Sep 17 00:00:00 2001 +From: Yong Zhao <Yong.Zhao@amd.com> +Date: Thu, 7 Nov 2019 23:18:04 -0500 +Subject: [PATCH 4435/4736] drm/amdkfd: Merge CIK kernel queue functions into + VI + +The only difference that CIK kernel queue functions are different from +VI is avoid allocating eop_mem. We can achieve that by using a if +condition. + +Change-Id: Iea9cbc82f603ff008a906c5ee32325ddcd02d963 +Signed-off-by: Yong Zhao <Yong.Zhao@amd.com> +Reviewed-by: Felix Kuehling <Felix.Kuehling@amd.com> +--- + drivers/gpu/drm/amd/amdkfd/Makefile | 1 - + drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.c | 7 +-- + drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.h | 1 - + .../gpu/drm/amd/amdkfd/kfd_kernel_queue_cik.c | 53 ------------------- + .../gpu/drm/amd/amdkfd/kfd_kernel_queue_vi.c | 7 +++ + 5 files changed, 9 insertions(+), 60 deletions(-) + delete mode 100644 drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue_cik.c + +diff --git a/drivers/gpu/drm/amd/amdkfd/Makefile b/drivers/gpu/drm/amd/amdkfd/Makefile +index c2c125156a62..a34a4a65970f 100644 +--- a/drivers/gpu/drm/amd/amdkfd/Makefile ++++ b/drivers/gpu/drm/amd/amdkfd/Makefile +@@ -38,7 +38,6 @@ AMDKFD_FILES := $(AMDKFD_PATH)/kfd_module.o \ + $(AMDKFD_PATH)/kfd_mqd_manager_v9.o \ + $(AMDKFD_PATH)/kfd_mqd_manager_v10.o \ + $(AMDKFD_PATH)/kfd_kernel_queue.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_packet_manager.o \ +diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.c b/drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.c +index 04041bab42a8..f3a08145d067 100644 +--- a/drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.c ++++ b/drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.c +@@ -346,6 +346,8 @@ struct kernel_queue *kernel_queue_init(struct kfd_dev *dev, + kq->ops.rollback_packet = rollback_packet; + + switch (dev->device_info->asic_family) { ++ case CHIP_KAVERI: ++ case CHIP_HAWAII: + case CHIP_CARRIZO: + case CHIP_TONGA: + case CHIP_FIJI: +@@ -356,11 +358,6 @@ struct kernel_queue *kernel_queue_init(struct kfd_dev *dev, + kernel_queue_init_vi(&kq->ops_asic_specific); + break; + +- case CHIP_KAVERI: +- case CHIP_HAWAII: +- kernel_queue_init_cik(&kq->ops_asic_specific); +- break; +- + case CHIP_VEGA10: + case CHIP_VEGA12: + case CHIP_VEGA20: +diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.h b/drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.h +index 384d7a37b343..b22ff0fb40fe 100644 +--- a/drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.h ++++ b/drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.h +@@ -109,7 +109,6 @@ struct kernel_queue { + struct list_head list; + }; + +-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); + +diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue_cik.c b/drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue_cik.c +deleted file mode 100644 +index 19e54acb4125..000000000000 +--- a/drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue_cik.c ++++ /dev/null +@@ -1,53 +0,0 @@ +-/* +- * Copyright 2014 Advanced Micro Devices, Inc. +- * +- * Permission is hereby granted, free of charge, to any person obtaining a +- * copy of this software and associated documentation files (the "Software"), +- * to deal in the Software without restriction, including without limitation +- * the rights to use, copy, modify, merge, publish, distribute, sublicense, +- * and/or sell copies of the Software, and to permit persons to whom the +- * Software is furnished to do so, subject to the following conditions: +- * +- * The above copyright notice and this permission notice shall be included in +- * all copies or substantial portions of the Software. +- * +- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +- * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR +- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, +- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +- * OTHER DEALINGS IN THE SOFTWARE. +- * +- */ +- +-#include "kfd_kernel_queue.h" +- +-static bool initialize_cik(struct kernel_queue *kq, struct kfd_dev *dev, +- enum kfd_queue_type type, unsigned int queue_size); +-static void uninitialize_cik(struct kernel_queue *kq); +-static void submit_packet_cik(struct kernel_queue *kq); +- +-void kernel_queue_init_cik(struct kernel_queue_ops *ops) +-{ +- ops->initialize = initialize_cik; +- ops->uninitialize = uninitialize_cik; +- ops->submit_packet = submit_packet_cik; +-} +- +-static bool initialize_cik(struct kernel_queue *kq, struct kfd_dev *dev, +- enum kfd_queue_type type, unsigned int queue_size) +-{ +- return true; +-} +- +-static void uninitialize_cik(struct kernel_queue *kq) +-{ +-} +- +-static void submit_packet_cik(struct kernel_queue *kq) +-{ +- *kq->wptr_kernel = kq->pending_wptr; +- write_kernel_doorbell(kq->queue->properties.doorbell_ptr, +- kq->pending_wptr); +-} +diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue_vi.c b/drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue_vi.c +index 7047f4c5a7dc..9b0380d91bfb 100644 +--- a/drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue_vi.c ++++ b/drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue_vi.c +@@ -43,6 +43,10 @@ static bool initialize_vi(struct kernel_queue *kq, struct kfd_dev *dev, + { + int retval; + ++ /*For CIK family asics, kq->eop_mem is not needed */ ++ if (dev->device_info->asic_family <= CHIP_MULLINS) ++ return true; ++ + retval = kfd_gtt_sa_allocate(dev, PAGE_SIZE, &kq->eop_mem); + if (retval != 0) + return false; +@@ -57,6 +61,9 @@ static bool initialize_vi(struct kernel_queue *kq, struct kfd_dev *dev, + + static void uninitialize_vi(struct kernel_queue *kq) + { ++ /* For CIK family asics, kq->eop_mem is Null, kfd_gtt_sa_free() ++ * is able to handle NULL properly. ++ */ + kfd_gtt_sa_free(kq->dev, kq->eop_mem); + } + +-- +2.17.1 + |