diff options
Diffstat (limited to 'drivers/gpu')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/channel_gk20a.c | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/ctxsw_trace_gk20a.c | 1 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/fecs_trace_gk20a.c | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/include/nvgpu/circ_buf.h | 20 |
4 files changed, 22 insertions, 3 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/channel_gk20a.c b/drivers/gpu/nvgpu/gk20a/channel_gk20a.c index 74c4f619..90efc658 100644 --- a/drivers/gpu/nvgpu/gk20a/channel_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/channel_gk20a.c | |||
@@ -19,7 +19,6 @@ | |||
19 | #include <linux/kthread.h> | 19 | #include <linux/kthread.h> |
20 | #include <trace/events/gk20a.h> | 20 | #include <trace/events/gk20a.h> |
21 | #include <linux/dma-buf.h> | 21 | #include <linux/dma-buf.h> |
22 | #include <linux/circ_buf.h> | ||
23 | 22 | ||
24 | #include <nvgpu/semaphore.h> | 23 | #include <nvgpu/semaphore.h> |
25 | #include <nvgpu/timers.h> | 24 | #include <nvgpu/timers.h> |
@@ -29,6 +28,7 @@ | |||
29 | #include <nvgpu/atomic.h> | 28 | #include <nvgpu/atomic.h> |
30 | #include <nvgpu/bug.h> | 29 | #include <nvgpu/bug.h> |
31 | #include <nvgpu/list.h> | 30 | #include <nvgpu/list.h> |
31 | #include <nvgpu/circ_buf.h> | ||
32 | 32 | ||
33 | #include "gk20a.h" | 33 | #include "gk20a.h" |
34 | #include "debug_gk20a.h" | 34 | #include "debug_gk20a.h" |
diff --git a/drivers/gpu/nvgpu/gk20a/ctxsw_trace_gk20a.c b/drivers/gpu/nvgpu/gk20a/ctxsw_trace_gk20a.c index 1598fe50..94f07701 100644 --- a/drivers/gpu/nvgpu/gk20a/ctxsw_trace_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/ctxsw_trace_gk20a.c | |||
@@ -13,7 +13,6 @@ | |||
13 | 13 | ||
14 | #include <asm/barrier.h> | 14 | #include <asm/barrier.h> |
15 | #include <linux/kthread.h> | 15 | #include <linux/kthread.h> |
16 | #include <linux/circ_buf.h> | ||
17 | #include <linux/wait.h> | 16 | #include <linux/wait.h> |
18 | #include <linux/ktime.h> | 17 | #include <linux/ktime.h> |
19 | #include <linux/debugfs.h> | 18 | #include <linux/debugfs.h> |
diff --git a/drivers/gpu/nvgpu/gk20a/fecs_trace_gk20a.c b/drivers/gpu/nvgpu/gk20a/fecs_trace_gk20a.c index b5bf34bb..7d509a4a 100644 --- a/drivers/gpu/nvgpu/gk20a/fecs_trace_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/fecs_trace_gk20a.c | |||
@@ -13,13 +13,13 @@ | |||
13 | 13 | ||
14 | #include <asm/barrier.h> | 14 | #include <asm/barrier.h> |
15 | #include <linux/kthread.h> | 15 | #include <linux/kthread.h> |
16 | #include <linux/circ_buf.h> | ||
17 | #include <linux/debugfs.h> | 16 | #include <linux/debugfs.h> |
18 | 17 | ||
19 | #include <nvgpu/kmem.h> | 18 | #include <nvgpu/kmem.h> |
20 | #include <nvgpu/dma.h> | 19 | #include <nvgpu/dma.h> |
21 | #include <nvgpu/bug.h> | 20 | #include <nvgpu/bug.h> |
22 | #include <nvgpu/hashtable.h> | 21 | #include <nvgpu/hashtable.h> |
22 | #include <nvgpu/circ_buf.h> | ||
23 | 23 | ||
24 | #include "ctxsw_trace_gk20a.h" | 24 | #include "ctxsw_trace_gk20a.h" |
25 | #include "fecs_trace_gk20a.h" | 25 | #include "fecs_trace_gk20a.h" |
diff --git a/drivers/gpu/nvgpu/include/nvgpu/circ_buf.h b/drivers/gpu/nvgpu/include/nvgpu/circ_buf.h new file mode 100644 index 00000000..1b40a642 --- /dev/null +++ b/drivers/gpu/nvgpu/include/nvgpu/circ_buf.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_CIRC_BUF_H__ | ||
14 | #define __NVGPU_CIRC_BUF_H__ | ||
15 | |||
16 | #ifdef __KERNEL__ | ||
17 | #include <linux/circ_buf.h> | ||
18 | #endif | ||
19 | |||
20 | #endif | ||