diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/1474-drm-amdkfd-Factor-out-the-duplicated-code.patch')
-rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/1474-drm-amdkfd-Factor-out-the-duplicated-code.patch | 111 |
1 files changed, 0 insertions, 111 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/1474-drm-amdkfd-Factor-out-the-duplicated-code.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/1474-drm-amdkfd-Factor-out-the-duplicated-code.patch deleted file mode 100644 index 8795f2ff..00000000 --- a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/1474-drm-amdkfd-Factor-out-the-duplicated-code.patch +++ /dev/null @@ -1,111 +0,0 @@ -From d43b9960b9913057240c97959cf668481efac5c5 Mon Sep 17 00:00:00 2001 -From: Amber Lin <Amber.Lin@amd.com> -Date: Fri, 8 Jul 2016 16:30:11 -0400 -Subject: [PATCH 1474/4131] drm/amdkfd: Factor out the duplicated code - -Replace the duplicated code with kfd_process_alloc_gpuvm(). - -Signed-off-by: Amber Lin <Amber.Lin@amd.com> ---- - drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 1 - - drivers/gpu/drm/amd/amdkfd/kfd_process.c | 52 ++++++-------------------------- - 2 files changed, 9 insertions(+), 44 deletions(-) - -diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_priv.h b/drivers/gpu/drm/amd/amdkfd/kfd_priv.h -index e702ed5..12dc343 100644 ---- a/drivers/gpu/drm/amd/amdkfd/kfd_priv.h -+++ b/drivers/gpu/drm/amd/amdkfd/kfd_priv.h -@@ -527,7 +527,6 @@ struct qcm_process_device { - uint32_t sh_hidden_private_base; - - /*cwsr memory*/ -- int cwsr_mem_handle; - uint64_t cwsr_base; - uint64_t tba_addr; - uint64_t tma_addr; -diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_process.c b/drivers/gpu/drm/amd/amdkfd/kfd_process.c -index 9b67aaf..b0fb998 100644 ---- a/drivers/gpu/drm/amd/amdkfd/kfd_process.c -+++ b/drivers/gpu/drm/amd/amdkfd/kfd_process.c -@@ -585,7 +585,6 @@ static int kfd_process_init_cwsr(struct kfd_process *p, struct file *filep) - int err; - unsigned long offset; - struct kfd_process_device *temp, *pdd = NULL; -- void *mem = NULL; - struct kfd_dev *dev = NULL; - struct qcm_process_device *qpd = NULL; - -@@ -599,46 +598,18 @@ static int kfd_process_init_cwsr(struct kfd_process *p, struct file *filep) - if (qpd->cwsr_base) { - /* cwsr_base is only set for DGPU */ - -- /* can't hold the process lock while -- * allocating from KGD */ -- up_write(&p->lock); -- -- err = dev->kfd2kgd->alloc_memory_of_gpu( -- dev->kgd, qpd->cwsr_base, dev->cwsr_size, -- pdd->vm, (struct kgd_mem **)&mem, -- NULL, &qpd->cwsr_kaddr, pdd, -- ALLOC_MEM_FLAGS_GTT | -- ALLOC_MEM_FLAGS_NONPAGED | -- ALLOC_MEM_FLAGS_EXECUTE_ACCESS | -- ALLOC_MEM_FLAGS_NO_SUBSTITUTE); -- if (err) -- goto err_alloc_tba; -- err = kfd_map_memory_to_gpu(dev, mem, p, pdd); -- if (err) -- goto err_map_tba; -- -- down_write(&p->lock); -- /* Check if someone else allocated the memory -- * while we weren't looking */ -- if (qpd->tba_addr) { -- up_write(&p->lock); -- dev->kfd2kgd->unmap_memory_to_gpu(dev->kgd, -- (struct kgd_mem *)mem, pdd->vm); -- dev->kfd2kgd->free_memory_of_gpu(dev->kgd, mem); -- down_write(&p->lock); -- } else { -- qpd->cwsr_mem_handle = -- kfd_process_device_create_obj_handle( -- pdd, mem, qpd->cwsr_base, -- dev->cwsr_size); -- if (qpd->cwsr_mem_handle < 0) -- goto err_create_handle; -- -+ err = kfd_process_alloc_gpuvm(p, dev, qpd->cwsr_base, -+ dev->cwsr_size, pdd->vm, -+ &qpd->cwsr_kaddr, pdd, &qpd->tba_addr); -+ if (!err) { - memcpy(qpd->cwsr_kaddr, kmap(dev->cwsr_pages), - PAGE_SIZE); - kunmap(dev->cwsr_pages); - qpd->tba_addr = qpd->cwsr_base; -- } -+ } else if (qpd->cwsr_kaddr) -+ err = 0; -+ else -+ goto out; - } else { - offset = (kfd_get_gpu_id(dev) | - KFD_MMAP_TYPE_RESERVED_MEM) << PAGE_SHIFT; -@@ -658,14 +629,9 @@ static int kfd_process_init_cwsr(struct kfd_process *p, struct file *filep) - qpd->tba_addr, qpd->tma_addr); - } - --err_create_handle: -+out: - up_write(&p->lock); - return err; -- --err_map_tba: -- dev->kfd2kgd->free_memory_of_gpu(dev->kgd, mem); --err_alloc_tba: -- return err; - } - - static struct kfd_process *create_process(const struct task_struct *thread) --- -2.7.4 - |