diff options
Diffstat (limited to 'drivers/gpu')
-rw-r--r-- | drivers/gpu/nvgpu/clk/clk_arb.c | 1 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/fence_gk20a.h | 3 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/fifo_gk20a.h | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/gk20a.h | 1 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/mm_gk20a.h | 1 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/sync_gk20a.c | 1 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/tsg_gk20a.h | 1 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/include/nvgpu/kref.h | 20 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/include/nvgpu/semaphore.h | 2 |
9 files changed, 30 insertions, 2 deletions
diff --git a/drivers/gpu/nvgpu/clk/clk_arb.c b/drivers/gpu/nvgpu/clk/clk_arb.c index 180b4fde..572de674 100644 --- a/drivers/gpu/nvgpu/clk/clk_arb.c +++ b/drivers/gpu/nvgpu/clk/clk_arb.c | |||
@@ -25,6 +25,7 @@ | |||
25 | #include <nvgpu/kmem.h> | 25 | #include <nvgpu/kmem.h> |
26 | #include <nvgpu/atomic.h> | 26 | #include <nvgpu/atomic.h> |
27 | #include <nvgpu/bug.h> | 27 | #include <nvgpu/bug.h> |
28 | #include <nvgpu/kref.h> | ||
28 | 29 | ||
29 | #include "gk20a/gk20a.h" | 30 | #include "gk20a/gk20a.h" |
30 | #include "clk/clk_arb.h" | 31 | #include "clk/clk_arb.h" |
diff --git a/drivers/gpu/nvgpu/gk20a/fence_gk20a.h b/drivers/gpu/nvgpu/gk20a/fence_gk20a.h index 77dae9a7..c26cd250 100644 --- a/drivers/gpu/nvgpu/gk20a/fence_gk20a.h +++ b/drivers/gpu/nvgpu/gk20a/fence_gk20a.h | |||
@@ -17,9 +17,10 @@ | |||
17 | #ifndef _GK20A_FENCE_H_ | 17 | #ifndef _GK20A_FENCE_H_ |
18 | #define _GK20A_FENCE_H_ | 18 | #define _GK20A_FENCE_H_ |
19 | 19 | ||
20 | #include <linux/kref.h> | ||
21 | #include <linux/wait.h> | 20 | #include <linux/wait.h> |
22 | 21 | ||
22 | #include <nvgpu/kref.h> | ||
23 | |||
23 | struct platform_device; | 24 | struct platform_device; |
24 | struct sync_timeline; | 25 | struct sync_timeline; |
25 | struct sync_fence; | 26 | struct sync_fence; |
diff --git a/drivers/gpu/nvgpu/gk20a/fifo_gk20a.h b/drivers/gpu/nvgpu/gk20a/fifo_gk20a.h index 70addf13..0bec9e82 100644 --- a/drivers/gpu/nvgpu/gk20a/fifo_gk20a.h +++ b/drivers/gpu/nvgpu/gk20a/fifo_gk20a.h | |||
@@ -25,6 +25,8 @@ | |||
25 | #include "tsg_gk20a.h" | 25 | #include "tsg_gk20a.h" |
26 | #include "debug_gk20a.h" | 26 | #include "debug_gk20a.h" |
27 | 27 | ||
28 | #include <nvgpu/kref.h> | ||
29 | |||
28 | #define MAX_RUNLIST_BUFFERS 2 | 30 | #define MAX_RUNLIST_BUFFERS 2 |
29 | 31 | ||
30 | #define FIFO_INVAL_ENGINE_ID ((u32)~0) | 32 | #define FIFO_INVAL_ENGINE_ID ((u32)~0) |
diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.h b/drivers/gpu/nvgpu/gk20a/gk20a.h index 85878423..763cccaf 100644 --- a/drivers/gpu/nvgpu/gk20a/gk20a.h +++ b/drivers/gpu/nvgpu/gk20a/gk20a.h | |||
@@ -42,6 +42,7 @@ struct dbg_profiler_object_data; | |||
42 | #include <nvgpu/log.h> | 42 | #include <nvgpu/log.h> |
43 | #include <nvgpu/pramin.h> | 43 | #include <nvgpu/pramin.h> |
44 | #include <nvgpu/acr/nvgpu_acr.h> | 44 | #include <nvgpu/acr/nvgpu_acr.h> |
45 | #include <nvgpu/kref.h> | ||
45 | 46 | ||
46 | #include "clk_gk20a.h" | 47 | #include "clk_gk20a.h" |
47 | #include "ce2_gk20a.h" | 48 | #include "ce2_gk20a.h" |
diff --git a/drivers/gpu/nvgpu/gk20a/mm_gk20a.h b/drivers/gpu/nvgpu/gk20a/mm_gk20a.h index 924c1d3d..7452a0c1 100644 --- a/drivers/gpu/nvgpu/gk20a/mm_gk20a.h +++ b/drivers/gpu/nvgpu/gk20a/mm_gk20a.h | |||
@@ -28,6 +28,7 @@ | |||
28 | #include <nvgpu/allocator.h> | 28 | #include <nvgpu/allocator.h> |
29 | #include <nvgpu/list.h> | 29 | #include <nvgpu/list.h> |
30 | #include <nvgpu/rbtree.h> | 30 | #include <nvgpu/rbtree.h> |
31 | #include <nvgpu/kref.h> | ||
31 | 32 | ||
32 | #ifdef CONFIG_ARM64 | 33 | #ifdef CONFIG_ARM64 |
33 | #define outer_flush_range(a, b) | 34 | #define outer_flush_range(a, b) |
diff --git a/drivers/gpu/nvgpu/gk20a/sync_gk20a.c b/drivers/gpu/nvgpu/gk20a/sync_gk20a.c index 04afe0a3..10c4f57b 100644 --- a/drivers/gpu/nvgpu/gk20a/sync_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/sync_gk20a.c | |||
@@ -24,6 +24,7 @@ | |||
24 | #include <nvgpu/kmem.h> | 24 | #include <nvgpu/kmem.h> |
25 | #include <nvgpu/semaphore.h> | 25 | #include <nvgpu/semaphore.h> |
26 | #include <nvgpu/bug.h> | 26 | #include <nvgpu/bug.h> |
27 | #include <nvgpu/kref.h> | ||
27 | 28 | ||
28 | #include "../drivers/staging/android/sync.h" | 29 | #include "../drivers/staging/android/sync.h" |
29 | 30 | ||
diff --git a/drivers/gpu/nvgpu/gk20a/tsg_gk20a.h b/drivers/gpu/nvgpu/gk20a/tsg_gk20a.h index 178b8672..945058a2 100644 --- a/drivers/gpu/nvgpu/gk20a/tsg_gk20a.h +++ b/drivers/gpu/nvgpu/gk20a/tsg_gk20a.h | |||
@@ -17,6 +17,7 @@ | |||
17 | #define __TSG_GK20A_H_ | 17 | #define __TSG_GK20A_H_ |
18 | 18 | ||
19 | #include <nvgpu/lock.h> | 19 | #include <nvgpu/lock.h> |
20 | #include <nvgpu/kref.h> | ||
20 | 21 | ||
21 | #define NVGPU_INVALID_TSG_ID (-1) | 22 | #define NVGPU_INVALID_TSG_ID (-1) |
22 | 23 | ||
diff --git a/drivers/gpu/nvgpu/include/nvgpu/kref.h b/drivers/gpu/nvgpu/include/nvgpu/kref.h new file mode 100644 index 00000000..d24db603 --- /dev/null +++ b/drivers/gpu/nvgpu/include/nvgpu/kref.h | |||
@@ -0,0 +1,20 @@ | |||
1 | /* | ||
2 | * Copyright (c) 2017, NVIDIA CORPORATION. All rights reserved. | ||
3 | * | ||
4 | * This program is free software; you can redistribute it and/or modify it | ||
5 | * under the terms and conditions of the GNU General Public License, | ||
6 | * version 2, as published by the Free Software Foundation. | ||
7 | * | ||
8 | * This program is distributed in the hope it will be useful, but WITHOUT | ||
9 | * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | ||
10 | * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for | ||
11 | * more details. | ||
12 | */ | ||
13 | #ifndef __NVGPU_KREF_H__ | ||
14 | #define __NVGPU_KREF_H__ | ||
15 | |||
16 | #ifdef __KERNEL__ | ||
17 | #include <linux/kref.h> | ||
18 | #endif | ||
19 | |||
20 | #endif /* __NVGPU_KREF_H__ */ | ||
diff --git a/drivers/gpu/nvgpu/include/nvgpu/semaphore.h b/drivers/gpu/nvgpu/include/nvgpu/semaphore.h index 6ab34d67..8e939e72 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/semaphore.h +++ b/drivers/gpu/nvgpu/include/nvgpu/semaphore.h | |||
@@ -14,7 +14,6 @@ | |||
14 | #ifndef SEMAPHORE_GK20A_H | 14 | #ifndef SEMAPHORE_GK20A_H |
15 | #define SEMAPHORE_GK20A_H | 15 | #define SEMAPHORE_GK20A_H |
16 | 16 | ||
17 | #include <linux/kref.h> | ||
18 | #include <linux/list.h> | 17 | #include <linux/list.h> |
19 | #include <linux/delay.h> | 18 | #include <linux/delay.h> |
20 | 19 | ||
@@ -22,6 +21,7 @@ | |||
22 | #include <nvgpu/allocator.h> | 21 | #include <nvgpu/allocator.h> |
23 | #include <nvgpu/atomic.h> | 22 | #include <nvgpu/atomic.h> |
24 | #include <nvgpu/bug.h> | 23 | #include <nvgpu/bug.h> |
24 | #include <nvgpu/kref.h> | ||
25 | 25 | ||
26 | #include "gk20a/gk20a.h" | 26 | #include "gk20a/gk20a.h" |
27 | #include "gk20a/mm_gk20a.h" | 27 | #include "gk20a/mm_gk20a.h" |