blob: 9508a5b20147ac327b2c290ea093bb5c60782bb1 (
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
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
|
From 946b14210cb93e4e3be85d9b19a932c46913d35a Mon Sep 17 00:00:00 2001
From: Evan Quan <evan.quan@amd.com>
Date: Tue, 16 May 2017 16:12:47 +0800
Subject: [PATCH 0801/4131] drm/amd/amdkcl: [4.10] fix for dma_fence structures
and apis - v2: define dma_fence* as fence* on oldler kernel
Change-Id: I7f0fcd052919081ab3509f55be7898c5742652ce
Signed-off-by: Evan Quan <evan.quan@amd.com>
Reviewed-by: Junwei Zhang <Jerry.Zhang@amd.com>
Signed-off-by: Kalyan Alle <kalyan.alle@amd.com>
Conflicts:
drivers/gpu/drm/amd/scheduler/gpu_scheduler.h
---
drivers/gpu/drm/amd/amdgpu/amdgpu.h | 1 -
drivers/gpu/drm/amd/amdgpu/amdgpu_sem.h | 1 -
drivers/gpu/drm/amd/scheduler/gpu_scheduler.h | 1 -
3 files changed, 3 deletions(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
index 80aca7d..5d9fcc2 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
@@ -34,7 +34,6 @@
#include <linux/kref.h>
#include <linux/rbtree.h>
#include <linux/hashtable.h>
-#include <linux/dma-fence.h>
#include <linux/version.h>
#include <drm/ttm/ttm_bo_api.h>
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_sem.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_sem.h
index 6a62729..1b8006f 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_sem.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_sem.h
@@ -32,7 +32,6 @@
#include <linux/ktime.h>
#include <linux/list.h>
#include <linux/spinlock.h>
-#include <linux/dma-fence.h>
struct amdgpu_sem_core {
struct file *file;
diff --git a/drivers/gpu/drm/amd/scheduler/gpu_scheduler.h b/drivers/gpu/drm/amd/scheduler/gpu_scheduler.h
index f9d8f28..befee4a 100644
--- a/drivers/gpu/drm/amd/scheduler/gpu_scheduler.h
+++ b/drivers/gpu/drm/amd/scheduler/gpu_scheduler.h
@@ -25,7 +25,6 @@
#define _GPU_SCHEDULER_H_
#include <linux/kfifo.h>
-#include <linux/dma-fence.h>
struct amd_gpu_scheduler;
struct amd_sched_rq;
--
2.7.4
|
