diff options
Diffstat (limited to 'drivers/gpu/nvgpu')
-rw-r--r-- | drivers/gpu/nvgpu/clk/clk_arb.c | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/common/linux/kmem.c | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/common/mm/lockless_allocator.c | 3 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/channel_gk20a.c | 1 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/channel_sync_gk20a.c | 1 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/ctxsw_trace_gk20a.c | 1 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/fifo_gk20a.c | 1 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/gk20a.h | 1 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/mc_gk20a.c | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gm20b/fifo_gm20b.c | 1 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gp10b/mc_gp10b.c | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/include/nvgpu/atomic.h | 20 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/include/nvgpu/semaphore.h | 1 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/vgpu/fifo_vgpu.c | 1 |
14 files changed, 34 insertions, 5 deletions
diff --git a/drivers/gpu/nvgpu/clk/clk_arb.c b/drivers/gpu/nvgpu/clk/clk_arb.c index 3625706c..38b7d88d 100644 --- a/drivers/gpu/nvgpu/clk/clk_arb.c +++ b/drivers/gpu/nvgpu/clk/clk_arb.c | |||
@@ -19,11 +19,11 @@ | |||
19 | #include <linux/llist.h> | 19 | #include <linux/llist.h> |
20 | #include <linux/uaccess.h> | 20 | #include <linux/uaccess.h> |
21 | #include <linux/poll.h> | 21 | #include <linux/poll.h> |
22 | #include <linux/atomic.h> | ||
23 | 22 | ||
24 | #include <nvgpu/bitops.h> | 23 | #include <nvgpu/bitops.h> |
25 | #include <nvgpu/lock.h> | 24 | #include <nvgpu/lock.h> |
26 | #include <nvgpu/kmem.h> | 25 | #include <nvgpu/kmem.h> |
26 | #include <nvgpu/atomic.h> | ||
27 | 27 | ||
28 | #include "gk20a/gk20a.h" | 28 | #include "gk20a/gk20a.h" |
29 | #include "clk/clk_arb.h" | 29 | #include "clk/clk_arb.h" |
diff --git a/drivers/gpu/nvgpu/common/linux/kmem.c b/drivers/gpu/nvgpu/common/linux/kmem.c index 87aeb184..a2e49e7a 100644 --- a/drivers/gpu/nvgpu/common/linux/kmem.c +++ b/drivers/gpu/nvgpu/common/linux/kmem.c | |||
@@ -16,7 +16,6 @@ | |||
16 | 16 | ||
17 | #include <linux/mutex.h> | 17 | #include <linux/mutex.h> |
18 | #include <linux/slab.h> | 18 | #include <linux/slab.h> |
19 | #include <linux/atomic.h> | ||
20 | #include <linux/rbtree.h> | 19 | #include <linux/rbtree.h> |
21 | #include <linux/debugfs.h> | 20 | #include <linux/debugfs.h> |
22 | #include <linux/spinlock.h> | 21 | #include <linux/spinlock.h> |
@@ -25,6 +24,7 @@ | |||
25 | #include <linux/stacktrace.h> | 24 | #include <linux/stacktrace.h> |
26 | 25 | ||
27 | #include <nvgpu/kmem.h> | 26 | #include <nvgpu/kmem.h> |
27 | #include <nvgpu/atomic.h> | ||
28 | 28 | ||
29 | #include "gk20a/gk20a.h" | 29 | #include "gk20a/gk20a.h" |
30 | 30 | ||
diff --git a/drivers/gpu/nvgpu/common/mm/lockless_allocator.c b/drivers/gpu/nvgpu/common/mm/lockless_allocator.c index 93c870b5..dc72d8bf 100644 --- a/drivers/gpu/nvgpu/common/mm/lockless_allocator.c +++ b/drivers/gpu/nvgpu/common/mm/lockless_allocator.c | |||
@@ -14,8 +14,7 @@ | |||
14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
15 | */ | 15 | */ |
16 | 16 | ||
17 | #include <linux/atomic.h> | 17 | #include <nvgpu/atomic.h> |
18 | |||
19 | #include <nvgpu/allocator.h> | 18 | #include <nvgpu/allocator.h> |
20 | #include <nvgpu/kmem.h> | 19 | #include <nvgpu/kmem.h> |
21 | 20 | ||
diff --git a/drivers/gpu/nvgpu/gk20a/channel_gk20a.c b/drivers/gpu/nvgpu/gk20a/channel_gk20a.c index c684be1f..88600f46 100644 --- a/drivers/gpu/nvgpu/gk20a/channel_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/channel_gk20a.c | |||
@@ -28,6 +28,7 @@ | |||
28 | #include <nvgpu/kmem.h> | 28 | #include <nvgpu/kmem.h> |
29 | #include <nvgpu/dma.h> | 29 | #include <nvgpu/dma.h> |
30 | #include <nvgpu/log.h> | 30 | #include <nvgpu/log.h> |
31 | #include <nvgpu/atomic.h> | ||
31 | 32 | ||
32 | #include "gk20a.h" | 33 | #include "gk20a.h" |
33 | #include "debug_gk20a.h" | 34 | #include "debug_gk20a.h" |
diff --git a/drivers/gpu/nvgpu/gk20a/channel_sync_gk20a.c b/drivers/gpu/nvgpu/gk20a/channel_sync_gk20a.c index 6d0f0854..1867fb82 100644 --- a/drivers/gpu/nvgpu/gk20a/channel_sync_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/channel_sync_gk20a.c | |||
@@ -21,6 +21,7 @@ | |||
21 | #include <nvgpu/semaphore.h> | 21 | #include <nvgpu/semaphore.h> |
22 | #include <nvgpu/kmem.h> | 22 | #include <nvgpu/kmem.h> |
23 | #include <nvgpu/log.h> | 23 | #include <nvgpu/log.h> |
24 | #include <nvgpu/atomic.h> | ||
24 | 25 | ||
25 | #include "channel_sync_gk20a.h" | 26 | #include "channel_sync_gk20a.h" |
26 | #include "gk20a.h" | 27 | #include "gk20a.h" |
diff --git a/drivers/gpu/nvgpu/gk20a/ctxsw_trace_gk20a.c b/drivers/gpu/nvgpu/gk20a/ctxsw_trace_gk20a.c index b33845d1..845663ac 100644 --- a/drivers/gpu/nvgpu/gk20a/ctxsw_trace_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/ctxsw_trace_gk20a.c | |||
@@ -33,6 +33,7 @@ | |||
33 | #include "gr_gk20a.h" | 33 | #include "gr_gk20a.h" |
34 | 34 | ||
35 | #include <nvgpu/log.h> | 35 | #include <nvgpu/log.h> |
36 | #include <nvgpu/atomic.h> | ||
36 | 37 | ||
37 | #include <nvgpu/hw/gk20a/hw_ctxsw_prog_gk20a.h> | 38 | #include <nvgpu/hw/gk20a/hw_ctxsw_prog_gk20a.h> |
38 | #include <nvgpu/hw/gk20a/hw_gr_gk20a.h> | 39 | #include <nvgpu/hw/gk20a/hw_gr_gk20a.h> |
diff --git a/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c b/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c index bdd068fe..08066604 100644 --- a/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c | |||
@@ -32,6 +32,7 @@ | |||
32 | #include <nvgpu/kmem.h> | 32 | #include <nvgpu/kmem.h> |
33 | #include <nvgpu/log.h> | 33 | #include <nvgpu/log.h> |
34 | #include <nvgpu/soc.h> | 34 | #include <nvgpu/soc.h> |
35 | #include <nvgpu/atomic.h> | ||
35 | 36 | ||
36 | #include "gk20a.h" | 37 | #include "gk20a.h" |
37 | #include "debug_gk20a.h" | 38 | #include "debug_gk20a.h" |
diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.h b/drivers/gpu/nvgpu/gk20a/gk20a.h index 1cff8dd5..c8e2bd08 100644 --- a/drivers/gpu/nvgpu/gk20a/gk20a.h +++ b/drivers/gpu/nvgpu/gk20a/gk20a.h | |||
@@ -35,7 +35,6 @@ struct dbg_profiler_object_data; | |||
35 | #include <linux/nvgpu.h> | 35 | #include <linux/nvgpu.h> |
36 | #include <linux/irqreturn.h> | 36 | #include <linux/irqreturn.h> |
37 | #include <linux/version.h> | 37 | #include <linux/version.h> |
38 | #include <linux/atomic.h> | ||
39 | #include <linux/cdev.h> | 38 | #include <linux/cdev.h> |
40 | 39 | ||
41 | #include "../../../arch/arm/mach-tegra/iomap.h" | 40 | #include "../../../arch/arm/mach-tegra/iomap.h" |
diff --git a/drivers/gpu/nvgpu/gk20a/mc_gk20a.c b/drivers/gpu/nvgpu/gk20a/mc_gk20a.c index 18fd3648..32a6532f 100644 --- a/drivers/gpu/nvgpu/gk20a/mc_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/mc_gk20a.c | |||
@@ -19,6 +19,8 @@ | |||
19 | #include "gk20a.h" | 19 | #include "gk20a.h" |
20 | #include "mc_gk20a.h" | 20 | #include "mc_gk20a.h" |
21 | 21 | ||
22 | #include <nvgpu/atomic.h> | ||
23 | |||
22 | #include <nvgpu/hw/gk20a/hw_mc_gk20a.h> | 24 | #include <nvgpu/hw/gk20a/hw_mc_gk20a.h> |
23 | 25 | ||
24 | void mc_gk20a_nonstall_cb(struct work_struct *work) | 26 | void mc_gk20a_nonstall_cb(struct work_struct *work) |
diff --git a/drivers/gpu/nvgpu/gm20b/fifo_gm20b.c b/drivers/gpu/nvgpu/gm20b/fifo_gm20b.c index e3aa43d6..22ff3629 100644 --- a/drivers/gpu/nvgpu/gm20b/fifo_gm20b.c +++ b/drivers/gpu/nvgpu/gm20b/fifo_gm20b.c | |||
@@ -22,6 +22,7 @@ | |||
22 | 22 | ||
23 | #include <nvgpu/timers.h> | 23 | #include <nvgpu/timers.h> |
24 | #include <nvgpu/log.h> | 24 | #include <nvgpu/log.h> |
25 | #include <nvgpu/atomic.h> | ||
25 | 26 | ||
26 | #include <nvgpu/hw/gm20b/hw_ccsr_gm20b.h> | 27 | #include <nvgpu/hw/gm20b/hw_ccsr_gm20b.h> |
27 | #include <nvgpu/hw/gm20b/hw_ram_gm20b.h> | 28 | #include <nvgpu/hw/gm20b/hw_ram_gm20b.h> |
diff --git a/drivers/gpu/nvgpu/gp10b/mc_gp10b.c b/drivers/gpu/nvgpu/gp10b/mc_gp10b.c index 5842cb62..4a48d7fa 100644 --- a/drivers/gpu/nvgpu/gp10b/mc_gp10b.c +++ b/drivers/gpu/nvgpu/gp10b/mc_gp10b.c | |||
@@ -18,6 +18,8 @@ | |||
18 | 18 | ||
19 | #include "mc_gp10b.h" | 19 | #include "mc_gp10b.h" |
20 | 20 | ||
21 | #include <nvgpu/atomic.h> | ||
22 | |||
21 | #include <nvgpu/hw/gp10b/hw_mc_gp10b.h> | 23 | #include <nvgpu/hw/gp10b/hw_mc_gp10b.h> |
22 | 24 | ||
23 | void mc_gp10b_intr_enable(struct gk20a *g) | 25 | void mc_gp10b_intr_enable(struct gk20a *g) |
diff --git a/drivers/gpu/nvgpu/include/nvgpu/atomic.h b/drivers/gpu/nvgpu/include/nvgpu/atomic.h new file mode 100644 index 00000000..700e29fe --- /dev/null +++ b/drivers/gpu/nvgpu/include/nvgpu/atomic.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_ATOMIC_H__ | ||
14 | #define __NVGPU_ATOMIC_H__ | ||
15 | |||
16 | #ifdef __KERNEL__ | ||
17 | #include <linux/atomic.h> | ||
18 | #endif | ||
19 | |||
20 | #endif | ||
diff --git a/drivers/gpu/nvgpu/include/nvgpu/semaphore.h b/drivers/gpu/nvgpu/include/nvgpu/semaphore.h index d9120b65..285fcdeb 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/semaphore.h +++ b/drivers/gpu/nvgpu/include/nvgpu/semaphore.h | |||
@@ -20,6 +20,7 @@ | |||
20 | 20 | ||
21 | #include <nvgpu/log.h> | 21 | #include <nvgpu/log.h> |
22 | #include <nvgpu/allocator.h> | 22 | #include <nvgpu/allocator.h> |
23 | #include <nvgpu/atomic.h> | ||
23 | 24 | ||
24 | #include "gk20a/gk20a.h" | 25 | #include "gk20a/gk20a.h" |
25 | #include "gk20a/mm_gk20a.h" | 26 | #include "gk20a/mm_gk20a.h" |
diff --git a/drivers/gpu/nvgpu/vgpu/fifo_vgpu.c b/drivers/gpu/nvgpu/vgpu/fifo_vgpu.c index e775abbb..5d1d1208 100644 --- a/drivers/gpu/nvgpu/vgpu/fifo_vgpu.c +++ b/drivers/gpu/nvgpu/vgpu/fifo_vgpu.c | |||
@@ -18,6 +18,7 @@ | |||
18 | 18 | ||
19 | #include <nvgpu/kmem.h> | 19 | #include <nvgpu/kmem.h> |
20 | #include <nvgpu/dma.h> | 20 | #include <nvgpu/dma.h> |
21 | #include <nvgpu/atomic.h> | ||
21 | 22 | ||
22 | #include "vgpu/vgpu.h" | 23 | #include "vgpu/vgpu.h" |
23 | #include "gk20a/ctxsw_trace_gk20a.h" | 24 | #include "gk20a/ctxsw_trace_gk20a.h" |