diff options
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/channel_gk20a.c | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/ctxsw_trace_gk20a.h | 64 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/fecs_trace_gk20a.c | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/fifo_gk20a.c | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/gk20a.c | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/gr_gk20a.c | 3 |
6 files changed, 6 insertions, 69 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/channel_gk20a.c b/drivers/gpu/nvgpu/gk20a/channel_gk20a.c index 546f4164..00d20357 100644 --- a/drivers/gpu/nvgpu/gk20a/channel_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/channel_gk20a.c | |||
@@ -42,6 +42,7 @@ | |||
42 | #include <nvgpu/debug.h> | 42 | #include <nvgpu/debug.h> |
43 | #include <nvgpu/ltc.h> | 43 | #include <nvgpu/ltc.h> |
44 | #include <nvgpu/barrier.h> | 44 | #include <nvgpu/barrier.h> |
45 | #include <nvgpu/ctxsw_trace.h> | ||
45 | 46 | ||
46 | /* | 47 | /* |
47 | * This is required for nvgpu_vm_find_buf() which is used in the tracing | 48 | * This is required for nvgpu_vm_find_buf() which is used in the tracing |
@@ -51,7 +52,6 @@ | |||
51 | #include <nvgpu/linux/vm.h> | 52 | #include <nvgpu/linux/vm.h> |
52 | 53 | ||
53 | #include "gk20a.h" | 54 | #include "gk20a.h" |
54 | #include "ctxsw_trace_gk20a.h" | ||
55 | #include "dbg_gpu_gk20a.h" | 55 | #include "dbg_gpu_gk20a.h" |
56 | #include "fence_gk20a.h" | 56 | #include "fence_gk20a.h" |
57 | 57 | ||
diff --git a/drivers/gpu/nvgpu/gk20a/ctxsw_trace_gk20a.h b/drivers/gpu/nvgpu/gk20a/ctxsw_trace_gk20a.h deleted file mode 100644 index dddb8603..00000000 --- a/drivers/gpu/nvgpu/gk20a/ctxsw_trace_gk20a.h +++ /dev/null | |||
@@ -1,64 +0,0 @@ | |||
1 | /* | ||
2 | * Copyright (c) 2016-2017, NVIDIA CORPORATION. All rights reserved. | ||
3 | * | ||
4 | * Permission is hereby granted, free of charge, to any person obtaining a | ||
5 | * copy of this software and associated documentation files (the "Software"), | ||
6 | * to deal in the Software without restriction, including without limitation | ||
7 | * the rights to use, copy, modify, merge, publish, distribute, sublicense, | ||
8 | * and/or sell copies of the Software, and to permit persons to whom the | ||
9 | * Software is furnished to do so, subject to the following conditions: | ||
10 | * | ||
11 | * The above copyright notice and this permission notice shall be included in | ||
12 | * all copies or substantial portions of the Software. | ||
13 | * | ||
14 | * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
15 | * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
16 | * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL | ||
17 | * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
18 | * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING | ||
19 | * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER | ||
20 | * DEALINGS IN THE SOFTWARE. | ||
21 | */ | ||
22 | |||
23 | #ifndef __CTXSW_TRACE_GK20A_H | ||
24 | #define __CTXSW_TRACE_GK20A_H | ||
25 | |||
26 | #include <nvgpu/types.h> | ||
27 | |||
28 | #define GK20A_CTXSW_TRACE_NUM_DEVS 1 | ||
29 | |||
30 | struct file; | ||
31 | struct inode; | ||
32 | struct gk20a; | ||
33 | struct gpu_ops; | ||
34 | struct nvgpu_ctxsw_trace_entry; | ||
35 | struct channel_gk20a; | ||
36 | struct channel_ctx_gk20a; | ||
37 | struct gk20a_ctxsw_dev; | ||
38 | struct gk20a_fecs_trace; | ||
39 | struct tsg_gk20a; | ||
40 | struct poll_table_struct; | ||
41 | |||
42 | int gk20a_ctxsw_dev_release(struct inode *inode, struct file *filp); | ||
43 | int gk20a_ctxsw_dev_open(struct inode *inode, struct file *filp); | ||
44 | long gk20a_ctxsw_dev_ioctl(struct file *filp, | ||
45 | unsigned int cmd, unsigned long arg); | ||
46 | ssize_t gk20a_ctxsw_dev_read(struct file *filp, char __user *buf, | ||
47 | size_t size, loff_t *offs); | ||
48 | unsigned int gk20a_ctxsw_dev_poll(struct file *filp, | ||
49 | struct poll_table_struct *pts); | ||
50 | int gk20a_ctxsw_dev_mmap(struct file *filp, struct vm_area_struct *vma); | ||
51 | int gk20a_ctxsw_dev_ring_alloc(struct gk20a *g, void **buf, size_t *size); | ||
52 | int gk20a_ctxsw_dev_ring_free(struct gk20a *g); | ||
53 | int gk20a_ctxsw_dev_mmap_buffer(struct gk20a *g, struct vm_area_struct *vma); | ||
54 | |||
55 | int gk20a_ctxsw_trace_init(struct gk20a *g); | ||
56 | void gk20a_ctxsw_trace_cleanup(struct gk20a *g); | ||
57 | int gk20a_ctxsw_trace_write(struct gk20a *g, | ||
58 | struct nvgpu_ctxsw_trace_entry *entry); | ||
59 | void gk20a_ctxsw_trace_wake_up(struct gk20a *g, int vmid); | ||
60 | |||
61 | void gk20a_ctxsw_trace_channel_reset(struct gk20a *g, struct channel_gk20a *ch); | ||
62 | void gk20a_ctxsw_trace_tsg_reset(struct gk20a *g, struct tsg_gk20a *tsg); | ||
63 | |||
64 | #endif /* __CTXSW_TRACE_GK20A_H */ | ||
diff --git a/drivers/gpu/nvgpu/gk20a/fecs_trace_gk20a.c b/drivers/gpu/nvgpu/gk20a/fecs_trace_gk20a.c index 1517d25a..cd206c2a 100644 --- a/drivers/gpu/nvgpu/gk20a/fecs_trace_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/fecs_trace_gk20a.c | |||
@@ -34,8 +34,8 @@ | |||
34 | #include <nvgpu/barrier.h> | 34 | #include <nvgpu/barrier.h> |
35 | #include <nvgpu/mm.h> | 35 | #include <nvgpu/mm.h> |
36 | #include <nvgpu/enabled.h> | 36 | #include <nvgpu/enabled.h> |
37 | #include <nvgpu/ctxsw_trace.h> | ||
37 | 38 | ||
38 | #include "ctxsw_trace_gk20a.h" | ||
39 | #include "fecs_trace_gk20a.h" | 39 | #include "fecs_trace_gk20a.h" |
40 | #include "gk20a.h" | 40 | #include "gk20a.h" |
41 | #include "gr_gk20a.h" | 41 | #include "gr_gk20a.h" |
diff --git a/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c b/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c index f3ed2efb..58a4180f 100644 --- a/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c | |||
@@ -37,9 +37,9 @@ | |||
37 | #include <nvgpu/debug.h> | 37 | #include <nvgpu/debug.h> |
38 | #include <nvgpu/nvhost.h> | 38 | #include <nvgpu/nvhost.h> |
39 | #include <nvgpu/barrier.h> | 39 | #include <nvgpu/barrier.h> |
40 | #include <nvgpu/ctxsw_trace.h> | ||
40 | 41 | ||
41 | #include "gk20a.h" | 42 | #include "gk20a.h" |
42 | #include "ctxsw_trace_gk20a.h" | ||
43 | #include "mm_gk20a.h" | 43 | #include "mm_gk20a.h" |
44 | 44 | ||
45 | #include <nvgpu/hw/gk20a/hw_fifo_gk20a.h> | 45 | #include <nvgpu/hw/gk20a/hw_fifo_gk20a.h> |
diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.c b/drivers/gpu/nvgpu/gk20a/gk20a.c index 6ca0362b..f2bb6dcf 100644 --- a/drivers/gpu/nvgpu/gk20a/gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/gk20a.c | |||
@@ -35,13 +35,13 @@ | |||
35 | #include <nvgpu/ltc.h> | 35 | #include <nvgpu/ltc.h> |
36 | #include <nvgpu/vidmem.h> | 36 | #include <nvgpu/vidmem.h> |
37 | #include <nvgpu/mm.h> | 37 | #include <nvgpu/mm.h> |
38 | #include <nvgpu/ctxsw_trace.h> | ||
38 | 39 | ||
39 | #include <trace/events/gk20a.h> | 40 | #include <trace/events/gk20a.h> |
40 | 41 | ||
41 | #include "gk20a.h" | 42 | #include "gk20a.h" |
42 | #include "channel_sync_gk20a.h" | 43 | #include "channel_sync_gk20a.h" |
43 | 44 | ||
44 | #include "ctxsw_trace_gk20a.h" | ||
45 | #include "dbg_gpu_gk20a.h" | 45 | #include "dbg_gpu_gk20a.h" |
46 | #include "mc_gk20a.h" | 46 | #include "mc_gk20a.h" |
47 | #include "hal.h" | 47 | #include "hal.h" |
diff --git a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c index ef7136fe..a95368c3 100644 --- a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c | |||
@@ -38,6 +38,7 @@ | |||
38 | #include <nvgpu/debug.h> | 38 | #include <nvgpu/debug.h> |
39 | #include <nvgpu/barrier.h> | 39 | #include <nvgpu/barrier.h> |
40 | #include <nvgpu/mm.h> | 40 | #include <nvgpu/mm.h> |
41 | #include <nvgpu/ctxsw_trace.h> | ||
41 | 42 | ||
42 | #include "gk20a.h" | 43 | #include "gk20a.h" |
43 | #include "kind_gk20a.h" | 44 | #include "kind_gk20a.h" |
@@ -45,7 +46,7 @@ | |||
45 | #include "gr_pri_gk20a.h" | 46 | #include "gr_pri_gk20a.h" |
46 | #include "regops_gk20a.h" | 47 | #include "regops_gk20a.h" |
47 | #include "dbg_gpu_gk20a.h" | 48 | #include "dbg_gpu_gk20a.h" |
48 | #include "ctxsw_trace_gk20a.h" | 49 | |
49 | #include "common/linux/os_linux.h" | 50 | #include "common/linux/os_linux.h" |
50 | 51 | ||
51 | #include <nvgpu/hw/gk20a/hw_ccsr_gk20a.h> | 52 | #include <nvgpu/hw/gk20a/hw_ccsr_gk20a.h> |