blob: 7e176a3c3aaa9a87478235d89b326a0d127c136a (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
|
From 23f8bf651d397a70d4761ac3e9d636961e0ecc7a 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 1291/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/amdkfd/backport/backport.h | 1 +
drivers/gpu/drm/amd/amdkfd/kfd_device.c | 1 -
2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/amd/amdkfd/backport/backport.h b/drivers/gpu/drm/amd/amdkfd/backport/backport.h
index dfb3af7..854c035 100644
--- a/drivers/gpu/drm/amd/amdkfd/backport/backport.h
+++ b/drivers/gpu/drm/amd/amdkfd/backport/backport.h
@@ -5,5 +5,6 @@
#include <kcl/kcl_compat.h>
#include <kcl/kcl_pci.h>
#include <kcl/kcl_mn.h>
+#include <kcl/kcl_fence.h>
#endif
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"
--
2.7.4
|
