diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/5674-drm-amdkfd-Don-t-use-kmap_atomic.patch')
| -rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/5674-drm-amdkfd-Don-t-use-kmap_atomic.patch | 52 |
1 files changed, 52 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/5674-drm-amdkfd-Don-t-use-kmap_atomic.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/5674-drm-amdkfd-Don-t-use-kmap_atomic.patch new file mode 100644 index 00000000..1e5d8b68 --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/5674-drm-amdkfd-Don-t-use-kmap_atomic.patch @@ -0,0 +1,52 @@ +From 8d0304033d057267bdd902ae3bc2d05619b8f123 Mon Sep 17 00:00:00 2001 +From: Felix Kuehling <Felix.Kuehling@amd.com> +Date: Fri, 4 May 2018 18:59:38 -0400 +Subject: [PATCH 5674/5725] drm/amdkfd: Don't use kmap_atomic + +kmap_atomic is an optimization that's only useful for CONFIG_HIGHMEM +which isn't applicable on x86_64. It also requires a lot more care +because it disabled page faults. This causes problems with +copy_from_user in the atomic section unless pages are faulted in +explicitly. + +Since KFD only supports 64-bit kernels, we don't need to handle the +complication of HIGHMEM and kmap_atomic. Use plain kmap instead. + +Bug: SWDEV-138474 + +Signed-off-by: Felix Kuehling <Felix.Kuehling@amd.com> +Signed-off-by: Kalyan Alle <kalyan.alle@amd.com> + +Conflicts: + drivers/gpu/drm/amd/amdkfd/kfd_chardev.c + +Change-Id: I6ecbd7c10fb8b589dc1ab8af8795ff3e6d416db1 +--- + drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c b/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c +index 73338f0..9ec224c 100644 +--- a/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c ++++ b/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c +@@ -2100,7 +2100,7 @@ static int kfd_copy_userptr_bos(struct cma_iter *si, struct cma_iter *di, + + for (i = 0; i < nl; i++) { + unsigned int n; +- void *kaddr = kmap_atomic(process_pages[i]); ++ void *kaddr = kmap(process_pages[i]); + + if (cma_write) { + n = copy_from_user(kaddr+offset_in_page, +@@ -2111,7 +2111,7 @@ static int kfd_copy_userptr_bos(struct cma_iter *si, struct cma_iter *di, + kaddr+offset_in_page, + copy_size); + } +- kunmap_atomic(kaddr); ++ kunmap(kaddr); + if (n) { + ret = -EFAULT; + break; +-- +2.7.4 + |