diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2746-drm-amdkfd-Move-sdma_queue_id-calculation-into-alloc.patch')
| -rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2746-drm-amdkfd-Move-sdma_queue_id-calculation-into-alloc.patch | 87 |
1 files changed, 87 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2746-drm-amdkfd-Move-sdma_queue_id-calculation-into-alloc.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2746-drm-amdkfd-Move-sdma_queue_id-calculation-into-alloc.patch new file mode 100644 index 00000000..9679d1fa --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2746-drm-amdkfd-Move-sdma_queue_id-calculation-into-alloc.patch @@ -0,0 +1,87 @@ +From 4439899186aedc11f235c455e7ddfac98d3740e7 Mon Sep 17 00:00:00 2001 +From: Yong Zhao <Yong.Zhao@amd.com> +Date: Mon, 14 Jan 2019 17:36:26 -0500 +Subject: [PATCH 2746/2940] drm/amdkfd: Move sdma_queue_id calculation into + allocate_sdma_queue() + +This avoids duplicated code. + +Change-Id: I5f9482737d628890f5fb6a9903792f5b380acd0d +Signed-off-by: Yong Zhao <Yong.Zhao@amd.com> +--- + .../drm/amd/amdkfd/kfd_device_queue_manager.c | 29 +++++++------------ + 1 file changed, 11 insertions(+), 18 deletions(-) + +diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c b/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c +index ddaa64b726a0..4ef0017259d5 100644 +--- a/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c ++++ b/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c +@@ -908,7 +908,7 @@ static int stop_nocpsch(struct device_queue_manager *dqm) + } + + static int allocate_sdma_queue(struct device_queue_manager *dqm, +- unsigned int *sdma_id) ++ struct queue *q) + { + int bit; + +@@ -918,7 +918,14 @@ static int allocate_sdma_queue(struct device_queue_manager *dqm, + bit = __ffs64(dqm->sdma_bitmap); + + dqm->sdma_bitmap &= ~(1ULL << bit); +- *sdma_id = bit; ++ q->sdma_id = bit; ++ ++ q->properties.sdma_engine_id = q->sdma_id % get_num_sdma_engines(dqm); ++ q->properties.sdma_queue_id = q->sdma_id / get_num_sdma_engines(dqm); ++ ++ pr_debug("SDMA id is: %d\n", q->sdma_id); ++ pr_debug("SDMA engine id: %d\n", q->properties.sdma_engine_id); ++ pr_debug("SDMA queue id: %d\n", q->properties.sdma_queue_id); + + return 0; + } +@@ -940,21 +947,14 @@ static int create_sdma_queue_nocpsch(struct device_queue_manager *dqm, + + mqd_mgr = dqm->mqd_mgrs[KFD_MQD_TYPE_SDMA]; + +- retval = allocate_sdma_queue(dqm, &q->sdma_id); ++ retval = allocate_sdma_queue(dqm, q); + if (retval) + return retval; + +- q->properties.sdma_queue_id = q->sdma_id / get_num_sdma_engines(dqm); +- q->properties.sdma_engine_id = q->sdma_id % get_num_sdma_engines(dqm); +- + retval = allocate_doorbell(qpd, q); + if (retval) + goto out_deallocate_sdma_queue; + +- pr_debug("SDMA id is: %d\n", q->sdma_id); +- pr_debug("SDMA queue id: %d\n", q->properties.sdma_queue_id); +- pr_debug("SDMA engine id: %d\n", q->properties.sdma_engine_id); +- + dqm->asic_ops.init_sdma_vm(dqm, q, qpd); + retval = mqd_mgr->init_mqd(mqd_mgr, &q->mqd, &q->mqd_mem_obj, + &q->gart_mqd_addr, &q->properties); +@@ -1160,16 +1160,9 @@ static int create_queue_cpsch(struct device_queue_manager *dqm, struct queue *q, + } + + if (q->properties.type == KFD_QUEUE_TYPE_SDMA) { +- retval = allocate_sdma_queue(dqm, &q->sdma_id); ++ retval = allocate_sdma_queue(dqm, q); + if (retval) + goto out_unlock; +- q->properties.sdma_queue_id = +- q->sdma_id / get_num_sdma_engines(dqm); +- q->properties.sdma_engine_id = +- q->sdma_id % get_num_sdma_engines(dqm); +- pr_debug("SDMA id is: %d\n", q->sdma_id); +- pr_debug("SDMA queue id: %d\n", q->properties.sdma_queue_id); +- pr_debug("SDMA engine id: %d\n", q->properties.sdma_engine_id); + } + + retval = allocate_doorbell(qpd, q); +-- +2.17.1 + |