aboutsummaryrefslogtreecommitdiffstats
path: root/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/1703-drm-amdkcl-KFD-4.10-dkms-fix-for-dma_fence.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/1703-drm-amdkcl-KFD-4.10-dkms-fix-for-dma_fence.patch')
-rw-r--r--meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/1703-drm-amdkcl-KFD-4.10-dkms-fix-for-dma_fence.patch70
1 files changed, 70 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/1703-drm-amdkcl-KFD-4.10-dkms-fix-for-dma_fence.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/1703-drm-amdkcl-KFD-4.10-dkms-fix-for-dma_fence.patch
new file mode 100644
index 00000000..ab483dc6
--- /dev/null
+++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/1703-drm-amdkcl-KFD-4.10-dkms-fix-for-dma_fence.patch
@@ -0,0 +1,70 @@
+From 6bc73d0ebee1c2709afb60afff3161158e047712 Mon Sep 17 00:00:00 2001
+From: Evan Quan <evan.quan@amd.com>
+Date: Thu, 18 May 2017 15:49:14 +0800
+Subject: [PATCH 1703/4131] drm/amdkcl: [KFD] [4.10] dkms fix for dma_fence*
+
+Change-Id: I587c5e1d2fb56782e2377b0a9b44d4b5f89ea152
+Signed-off-by: Evan Quan <evan.quan@amd.com>
+Reviewed-by: Junwei Zhang <Jerry.Zhang@amd.com>
+
+ Conflicts:
+ drivers/gpu/drm/amd/include/kgd_kfd_interface.h
+---
+ drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_fence.c | 1 -
+ drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 2 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_device.c | 1 -
+ drivers/gpu/drm/amd/include/kgd_kfd_interface.h | 1 -
+ 4 files changed, 1 insertion(+), 4 deletions(-)
+
+diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_fence.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_fence.c
+index d509748..3961937 100644
+--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_fence.c
++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_fence.c
+@@ -20,7 +20,6 @@
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+-#include <linux/dma-fence.h>
+ #include <linux/spinlock.h>
+ #include <linux/atomic.h>
+ #include <linux/stacktrace.h>
+diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
+index 2646597..21cf3b0 100644
+--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
+@@ -1403,7 +1403,7 @@ int amdgpu_amdkfd_gpuvm_create_process_vm(struct kgd_dev *kgd, void **vm,
+ INIT_LIST_HEAD(&info->userptr_inval_list);
+
+ info->eviction_fence =
+- amdgpu_amdkfd_fence_create(dma_fence_context_alloc(1),
++ amdgpu_amdkfd_fence_create(kcl_fence_context_alloc(1),
+ current->mm);
+ if (info->eviction_fence == NULL) {
+ pr_err("Failed to create eviction fence\n");
+diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_device.c b/drivers/gpu/drm/amd/amdkfd/kfd_device.c
+index 94d8fce..ec4166c 100644
+--- a/drivers/gpu/drm/amd/amdkfd/kfd_device.c
++++ b/drivers/gpu/drm/amd/amdkfd/kfd_device.c
+@@ -26,7 +26,6 @@
+ #include <linux/pci.h>
+ #include <linux/slab.h>
+ #include <linux/highmem.h>
+-#include <linux/dma-fence.h>
+ #include "kfd_priv.h"
+ #include "kfd_device_queue_manager.h"
+ #include "kfd_pm4_headers_vi.h"
+diff --git a/drivers/gpu/drm/amd/include/kgd_kfd_interface.h b/drivers/gpu/drm/amd/include/kgd_kfd_interface.h
+index 7fff662..c0c1cc7 100644
+--- a/drivers/gpu/drm/amd/include/kgd_kfd_interface.h
++++ b/drivers/gpu/drm/amd/include/kgd_kfd_interface.h
+@@ -30,7 +30,6 @@
+
+ #include <linux/types.h>
+ #include <linux/bitmap.h>
+-#include <linux/dma-fence.h>
+ #include <linux/dma-buf.h>
+
+ struct pci_dev;
+--
+2.7.4
+