diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/gpu/nvgpu/Makefile | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/Makefile.sources | 4 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/common/fifo/tsg.c (renamed from drivers/gpu/nvgpu/gk20a/tsg_gk20a.c) | 5 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gm20b/hal_gm20b.c | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gp10b/hal_gp10b.c | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/include/nvgpu/gk20a.h | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/include/nvgpu/tsg.h (renamed from drivers/gpu/nvgpu/gk20a/tsg_gk20a.h) | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/os/linux/ioctl_dbg.c | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/os/linux/ioctl_tsg.c | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/os/linux/vgpu/vgpu_linux.c | 1 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/os/posix/posix-tsg.c (renamed from drivers/gpu/nvgpu/os/posix/tsg.c) | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/vgpu/gr_vgpu.c | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/vgpu/tsg_vgpu.c | 5 |
13 files changed, 16 insertions, 17 deletions
diff --git a/drivers/gpu/nvgpu/Makefile b/drivers/gpu/nvgpu/Makefile index bf02affe..4e08cd51 100644 --- a/drivers/gpu/nvgpu/Makefile +++ b/drivers/gpu/nvgpu/Makefile | |||
@@ -224,6 +224,7 @@ nvgpu-y += \ | |||
224 | common/sim_pci.o \ | 224 | common/sim_pci.o \ |
225 | common/fifo/channel.o \ | 225 | common/fifo/channel.o \ |
226 | common/fifo/submit.o \ | 226 | common/fifo/submit.o \ |
227 | common/fifo/tsg.o \ | ||
227 | common/ecc.o \ | 228 | common/ecc.o \ |
228 | common/ce2.o \ | 229 | common/ce2.o \ |
229 | gk20a/gk20a.o \ | 230 | gk20a/gk20a.o \ |
@@ -238,7 +239,6 @@ nvgpu-y += \ | |||
238 | gk20a/fence_gk20a.o \ | 239 | gk20a/fence_gk20a.o \ |
239 | gk20a/gr_ctx_gk20a_sim.o \ | 240 | gk20a/gr_ctx_gk20a_sim.o \ |
240 | gk20a/gr_ctx_gk20a.o \ | 241 | gk20a/gr_ctx_gk20a.o \ |
241 | gk20a/tsg_gk20a.o \ | ||
242 | gk20a/fecs_trace_gk20a.o \ | 242 | gk20a/fecs_trace_gk20a.o \ |
243 | gm20b/hal_gm20b.o \ | 243 | gm20b/hal_gm20b.o \ |
244 | gm20b/gr_gm20b.o \ | 244 | gm20b/gr_gm20b.o \ |
diff --git a/drivers/gpu/nvgpu/Makefile.sources b/drivers/gpu/nvgpu/Makefile.sources index 4e67434d..4283a01c 100644 --- a/drivers/gpu/nvgpu/Makefile.sources +++ b/drivers/gpu/nvgpu/Makefile.sources | |||
@@ -40,7 +40,7 @@ srcs := os/posix/nvgpu.c \ | |||
40 | os/posix/fuse.c \ | 40 | os/posix/fuse.c \ |
41 | os/posix/clk_arb.c \ | 41 | os/posix/clk_arb.c \ |
42 | os/posix/posix-channel.c \ | 42 | os/posix/posix-channel.c \ |
43 | os/posix/tsg.c \ | 43 | os/posix/posix-tsg.c \ |
44 | os/posix/nvlink.c \ | 44 | os/posix/nvlink.c \ |
45 | os/posix/lock.c \ | 45 | os/posix/lock.c \ |
46 | os/posix/stubs.c \ | 46 | os/posix/stubs.c \ |
@@ -109,6 +109,7 @@ srcs := os/posix/nvgpu.c \ | |||
109 | common/clock_gating/gv100_gating_reglist.c \ | 109 | common/clock_gating/gv100_gating_reglist.c \ |
110 | common/fifo/channel.c \ | 110 | common/fifo/channel.c \ |
111 | common/fifo/submit.c \ | 111 | common/fifo/submit.c \ |
112 | common/fifo/tsg.c \ | ||
112 | common/mc/mc.c \ | 113 | common/mc/mc.c \ |
113 | common/mc/mc_gm20b.c \ | 114 | common/mc/mc_gm20b.c \ |
114 | common/mc/mc_gp10b.c \ | 115 | common/mc/mc_gp10b.c \ |
@@ -158,7 +159,6 @@ srcs := os/posix/nvgpu.c \ | |||
158 | gk20a/fence_gk20a.c \ | 159 | gk20a/fence_gk20a.c \ |
159 | gk20a/gr_ctx_gk20a_sim.c \ | 160 | gk20a/gr_ctx_gk20a_sim.c \ |
160 | gk20a/gr_ctx_gk20a.c \ | 161 | gk20a/gr_ctx_gk20a.c \ |
161 | gk20a/tsg_gk20a.c \ | ||
162 | gm20b/hal_gm20b.c \ | 162 | gm20b/hal_gm20b.c \ |
163 | gm20b/gr_gm20b.c \ | 163 | gm20b/gr_gm20b.c \ |
164 | gm20b/clk_gm20b.c \ | 164 | gm20b/clk_gm20b.c \ |
diff --git a/drivers/gpu/nvgpu/gk20a/tsg_gk20a.c b/drivers/gpu/nvgpu/common/fifo/tsg.c index 885ce172..0892e8bf 100644 --- a/drivers/gpu/nvgpu/gk20a/tsg_gk20a.c +++ b/drivers/gpu/nvgpu/common/fifo/tsg.c | |||
@@ -24,9 +24,8 @@ | |||
24 | #include <nvgpu/log.h> | 24 | #include <nvgpu/log.h> |
25 | #include <nvgpu/os_sched.h> | 25 | #include <nvgpu/os_sched.h> |
26 | #include <nvgpu/channel.h> | 26 | #include <nvgpu/channel.h> |
27 | 27 | #include <nvgpu/tsg.h> | |
28 | #include "gk20a.h" | 28 | #include <nvgpu/gk20a.h> |
29 | #include "tsg_gk20a.h" | ||
30 | 29 | ||
31 | bool gk20a_is_channel_marked_as_tsg(struct channel_gk20a *ch) | 30 | bool gk20a_is_channel_marked_as_tsg(struct channel_gk20a *ch) |
32 | { | 31 | { |
diff --git a/drivers/gpu/nvgpu/gm20b/hal_gm20b.c b/drivers/gpu/nvgpu/gm20b/hal_gm20b.c index 133428da..427403e3 100644 --- a/drivers/gpu/nvgpu/gm20b/hal_gm20b.c +++ b/drivers/gpu/nvgpu/gm20b/hal_gm20b.c | |||
@@ -28,6 +28,7 @@ | |||
28 | #include <nvgpu/error_notifier.h> | 28 | #include <nvgpu/error_notifier.h> |
29 | #include <nvgpu/gk20a.h> | 29 | #include <nvgpu/gk20a.h> |
30 | #include <nvgpu/channel.h> | 30 | #include <nvgpu/channel.h> |
31 | #include <nvgpu/tsg.h> | ||
31 | 32 | ||
32 | #include "common/clock_gating/gm20b_gating_reglist.h" | 33 | #include "common/clock_gating/gm20b_gating_reglist.h" |
33 | #include "common/bus/bus_gm20b.h" | 34 | #include "common/bus/bus_gm20b.h" |
@@ -50,7 +51,6 @@ | |||
50 | #include "gk20a/regops_gk20a.h" | 51 | #include "gk20a/regops_gk20a.h" |
51 | #include "gk20a/pmu_gk20a.h" | 52 | #include "gk20a/pmu_gk20a.h" |
52 | #include "gk20a/gr_gk20a.h" | 53 | #include "gk20a/gr_gk20a.h" |
53 | #include "gk20a/tsg_gk20a.h" | ||
54 | 54 | ||
55 | #include "gr_gm20b.h" | 55 | #include "gr_gm20b.h" |
56 | #include "fifo_gm20b.h" | 56 | #include "fifo_gm20b.h" |
diff --git a/drivers/gpu/nvgpu/gp10b/hal_gp10b.c b/drivers/gpu/nvgpu/gp10b/hal_gp10b.c index 740cb8b7..68dfcfe4 100644 --- a/drivers/gpu/nvgpu/gp10b/hal_gp10b.c +++ b/drivers/gpu/nvgpu/gp10b/hal_gp10b.c | |||
@@ -29,6 +29,7 @@ | |||
29 | #include <nvgpu/error_notifier.h> | 29 | #include <nvgpu/error_notifier.h> |
30 | #include <nvgpu/gk20a.h> | 30 | #include <nvgpu/gk20a.h> |
31 | #include <nvgpu/channel.h> | 31 | #include <nvgpu/channel.h> |
32 | #include <nvgpu/tsg.h> | ||
32 | 33 | ||
33 | #include "common/bus/bus_gk20a.h" | 34 | #include "common/bus/bus_gk20a.h" |
34 | #include "common/clock_gating/gp10b_gating_reglist.h" | 35 | #include "common/clock_gating/gp10b_gating_reglist.h" |
@@ -57,7 +58,6 @@ | |||
57 | #include "gk20a/regops_gk20a.h" | 58 | #include "gk20a/regops_gk20a.h" |
58 | #include "gk20a/pmu_gk20a.h" | 59 | #include "gk20a/pmu_gk20a.h" |
59 | #include "gk20a/gr_gk20a.h" | 60 | #include "gk20a/gr_gk20a.h" |
60 | #include "gk20a/tsg_gk20a.h" | ||
61 | 61 | ||
62 | #include "gp10b/gr_gp10b.h" | 62 | #include "gp10b/gr_gp10b.h" |
63 | #include "gp10b/fecs_trace_gp10b.h" | 63 | #include "gp10b/fecs_trace_gp10b.h" |
diff --git a/drivers/gpu/nvgpu/include/nvgpu/gk20a.h b/drivers/gpu/nvgpu/include/nvgpu/gk20a.h index 2fd533c6..ad77f802 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/gk20a.h +++ b/drivers/gpu/nvgpu/include/nvgpu/gk20a.h | |||
@@ -66,11 +66,11 @@ struct nvgpu_gpfifo_args; | |||
66 | #include <nvgpu/nvlink.h> | 66 | #include <nvgpu/nvlink.h> |
67 | #include <nvgpu/sim.h> | 67 | #include <nvgpu/sim.h> |
68 | #include <nvgpu/ecc.h> | 68 | #include <nvgpu/ecc.h> |
69 | #include <nvgpu/tsg.h> | ||
69 | 70 | ||
70 | #include "gk20a/clk_gk20a.h" | 71 | #include "gk20a/clk_gk20a.h" |
71 | #include "gk20a/ce2_gk20a.h" | 72 | #include "gk20a/ce2_gk20a.h" |
72 | #include "gk20a/fifo_gk20a.h" | 73 | #include "gk20a/fifo_gk20a.h" |
73 | #include "gk20a/tsg_gk20a.h" | ||
74 | #include "clk/clk.h" | 74 | #include "clk/clk.h" |
75 | #include "perf/perf.h" | 75 | #include "perf/perf.h" |
76 | #include "pmgr/pmgr.h" | 76 | #include "pmgr/pmgr.h" |
diff --git a/drivers/gpu/nvgpu/gk20a/tsg_gk20a.h b/drivers/gpu/nvgpu/include/nvgpu/tsg.h index 1e3be553..bed84986 100644 --- a/drivers/gpu/nvgpu/gk20a/tsg_gk20a.h +++ b/drivers/gpu/nvgpu/include/nvgpu/tsg.h | |||
@@ -26,7 +26,7 @@ | |||
26 | #include <nvgpu/kref.h> | 26 | #include <nvgpu/kref.h> |
27 | #include <nvgpu/rwsem.h> | 27 | #include <nvgpu/rwsem.h> |
28 | 28 | ||
29 | #include "gr_gk20a.h" | 29 | #include "gk20a/gr_gk20a.h" |
30 | 30 | ||
31 | #define NVGPU_INVALID_TSG_ID (-1) | 31 | #define NVGPU_INVALID_TSG_ID (-1) |
32 | 32 | ||
diff --git a/drivers/gpu/nvgpu/os/linux/ioctl_dbg.c b/drivers/gpu/nvgpu/os/linux/ioctl_dbg.c index 953b7168..705434be 100644 --- a/drivers/gpu/nvgpu/os/linux/ioctl_dbg.c +++ b/drivers/gpu/nvgpu/os/linux/ioctl_dbg.c | |||
@@ -31,12 +31,12 @@ | |||
31 | #include <nvgpu/cond.h> | 31 | #include <nvgpu/cond.h> |
32 | #include <nvgpu/utils.h> | 32 | #include <nvgpu/utils.h> |
33 | #include <nvgpu/channel.h> | 33 | #include <nvgpu/channel.h> |
34 | #include <nvgpu/tsg.h> | ||
34 | 35 | ||
35 | #include <nvgpu/linux/vm.h> | 36 | #include <nvgpu/linux/vm.h> |
36 | 37 | ||
37 | #include "gk20a/gk20a.h" | 38 | #include "gk20a/gk20a.h" |
38 | #include "gk20a/gr_gk20a.h" | 39 | #include "gk20a/gr_gk20a.h" |
39 | #include "gk20a/tsg_gk20a.h" | ||
40 | #include "gk20a/regops_gk20a.h" | 40 | #include "gk20a/regops_gk20a.h" |
41 | #include "gk20a/dbg_gpu_gk20a.h" | 41 | #include "gk20a/dbg_gpu_gk20a.h" |
42 | #include "os_linux.h" | 42 | #include "os_linux.h" |
diff --git a/drivers/gpu/nvgpu/os/linux/ioctl_tsg.c b/drivers/gpu/nvgpu/os/linux/ioctl_tsg.c index 6dd96d6b..998a1544 100644 --- a/drivers/gpu/nvgpu/os/linux/ioctl_tsg.c +++ b/drivers/gpu/nvgpu/os/linux/ioctl_tsg.c | |||
@@ -26,9 +26,9 @@ | |||
26 | #include <nvgpu/log.h> | 26 | #include <nvgpu/log.h> |
27 | #include <nvgpu/os_sched.h> | 27 | #include <nvgpu/os_sched.h> |
28 | #include <nvgpu/channel.h> | 28 | #include <nvgpu/channel.h> |
29 | #include <nvgpu/tsg.h> | ||
29 | 30 | ||
30 | #include "gk20a/gk20a.h" | 31 | #include "gk20a/gk20a.h" |
31 | #include "gk20a/tsg_gk20a.h" | ||
32 | #include "gv11b/fifo_gv11b.h" | 32 | #include "gv11b/fifo_gv11b.h" |
33 | #include "platform_gk20a.h" | 33 | #include "platform_gk20a.h" |
34 | #include "ioctl_tsg.h" | 34 | #include "ioctl_tsg.h" |
diff --git a/drivers/gpu/nvgpu/os/linux/vgpu/vgpu_linux.c b/drivers/gpu/nvgpu/os/linux/vgpu/vgpu_linux.c index f5628bc1..475c6dc0 100644 --- a/drivers/gpu/nvgpu/os/linux/vgpu/vgpu_linux.c +++ b/drivers/gpu/nvgpu/os/linux/vgpu/vgpu_linux.c | |||
@@ -36,7 +36,6 @@ | |||
36 | #include "vgpu_linux.h" | 36 | #include "vgpu_linux.h" |
37 | #include "vgpu/fecs_trace_vgpu.h" | 37 | #include "vgpu/fecs_trace_vgpu.h" |
38 | #include "vgpu/clk_vgpu.h" | 38 | #include "vgpu/clk_vgpu.h" |
39 | #include "gk20a/tsg_gk20a.h" | ||
40 | #include "gk20a/regops_gk20a.h" | 39 | #include "gk20a/regops_gk20a.h" |
41 | #include "gm20b/hal_gm20b.h" | 40 | #include "gm20b/hal_gm20b.h" |
42 | 41 | ||
diff --git a/drivers/gpu/nvgpu/os/posix/tsg.c b/drivers/gpu/nvgpu/os/posix/posix-tsg.c index 8736123d..d8e3f370 100644 --- a/drivers/gpu/nvgpu/os/posix/tsg.c +++ b/drivers/gpu/nvgpu/os/posix/posix-tsg.c | |||
@@ -20,7 +20,7 @@ | |||
20 | * DEALINGS IN THE SOFTWARE. | 20 | * DEALINGS IN THE SOFTWARE. |
21 | */ | 21 | */ |
22 | 22 | ||
23 | #include "gk20a/tsg_gk20a.h" | 23 | #include <nvgpu/tsg.h> |
24 | 24 | ||
25 | void gk20a_tsg_event_id_post_event(struct tsg_gk20a *tsg, | 25 | void gk20a_tsg_event_id_post_event(struct tsg_gk20a *tsg, |
26 | int __event_id) | 26 | int __event_id) |
diff --git a/drivers/gpu/nvgpu/vgpu/gr_vgpu.c b/drivers/gpu/nvgpu/vgpu/gr_vgpu.c index 4b1cf212..9fafa52f 100644 --- a/drivers/gpu/nvgpu/vgpu/gr_vgpu.c +++ b/drivers/gpu/nvgpu/vgpu/gr_vgpu.c | |||
@@ -30,11 +30,11 @@ | |||
30 | #include <nvgpu/vgpu/vgpu_ivc.h> | 30 | #include <nvgpu/vgpu/vgpu_ivc.h> |
31 | #include <nvgpu/vgpu/vgpu.h> | 31 | #include <nvgpu/vgpu/vgpu.h> |
32 | #include <nvgpu/channel.h> | 32 | #include <nvgpu/channel.h> |
33 | #include <nvgpu/tsg.h> | ||
33 | 34 | ||
34 | #include "gr_vgpu.h" | 35 | #include "gr_vgpu.h" |
35 | #include "gk20a/gk20a.h" | 36 | #include "gk20a/gk20a.h" |
36 | #include "gk20a/dbg_gpu_gk20a.h" | 37 | #include "gk20a/dbg_gpu_gk20a.h" |
37 | #include "gk20a/tsg_gk20a.h" | ||
38 | #include "gk20a/fecs_trace_gk20a.h" | 38 | #include "gk20a/fecs_trace_gk20a.h" |
39 | 39 | ||
40 | #include <nvgpu/hw/gk20a/hw_gr_gk20a.h> | 40 | #include <nvgpu/hw/gk20a/hw_gr_gk20a.h> |
diff --git a/drivers/gpu/nvgpu/vgpu/tsg_vgpu.c b/drivers/gpu/nvgpu/vgpu/tsg_vgpu.c index a81b5022..3553bf51 100644 --- a/drivers/gpu/nvgpu/vgpu/tsg_vgpu.c +++ b/drivers/gpu/nvgpu/vgpu/tsg_vgpu.c | |||
@@ -21,11 +21,12 @@ | |||
21 | */ | 21 | */ |
22 | 22 | ||
23 | #include "gk20a/gk20a.h" | 23 | #include "gk20a/gk20a.h" |
24 | #include "gk20a/tsg_gk20a.h" | ||
25 | #include "fifo_vgpu.h" | 24 | #include "fifo_vgpu.h" |
26 | #include <nvgpu/channel.h> | ||
27 | 25 | ||
26 | #include <nvgpu/channel.h> | ||
27 | #include <nvgpu/tsg.h> | ||
28 | #include <nvgpu/bug.h> | 28 | #include <nvgpu/bug.h> |
29 | |||
29 | #include <nvgpu/vgpu/tegra_vgpu.h> | 30 | #include <nvgpu/vgpu/tegra_vgpu.h> |
30 | #include <nvgpu/vgpu/vgpu.h> | 31 | #include <nvgpu/vgpu/vgpu.h> |
31 | 32 | ||