diff options
Diffstat (limited to 'drivers/gpu')
-rw-r--r-- | drivers/gpu/nvgpu/Makefile | 4 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/Makefile.sources | 4 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/common/fifo/channel.c (renamed from drivers/gpu/nvgpu/gk20a/channel_gk20a.c) | 6 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/os/linux/linux-channel.c (renamed from drivers/gpu/nvgpu/os/linux/channel.c) | 0 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/os/posix/posix-channel.c (renamed from drivers/gpu/nvgpu/os/posix/channel.c) | 0 |
5 files changed, 7 insertions, 7 deletions
diff --git a/drivers/gpu/nvgpu/Makefile b/drivers/gpu/nvgpu/Makefile index c7ccefb5..a6f0f0ce 100644 --- a/drivers/gpu/nvgpu/Makefile +++ b/drivers/gpu/nvgpu/Makefile | |||
@@ -74,7 +74,7 @@ nvgpu-y += \ | |||
74 | os/linux/comptags.o \ | 74 | os/linux/comptags.o \ |
75 | os/linux/dmabuf.o \ | 75 | os/linux/dmabuf.o \ |
76 | os/linux/sched.o \ | 76 | os/linux/sched.o \ |
77 | os/linux/channel.o \ | 77 | os/linux/linux-channel.o \ |
78 | os/linux/sim.o \ | 78 | os/linux/sim.o \ |
79 | os/linux/sim_pci.o \ | 79 | os/linux/sim_pci.o \ |
80 | os/linux/os_sched.o \ | 80 | os/linux/os_sched.o \ |
@@ -200,13 +200,13 @@ nvgpu-y += \ | |||
200 | common/clock_gating/gv11b_gating_reglist.o \ | 200 | common/clock_gating/gv11b_gating_reglist.o \ |
201 | common/sim.o \ | 201 | common/sim.o \ |
202 | common/sim_pci.o \ | 202 | common/sim_pci.o \ |
203 | common/fifo/channel.o \ | ||
203 | common/fifo/submit.o \ | 204 | common/fifo/submit.o \ |
204 | common/ecc.o \ | 205 | common/ecc.o \ |
205 | common/ce2.o \ | 206 | common/ce2.o \ |
206 | gk20a/gk20a.o \ | 207 | gk20a/gk20a.o \ |
207 | gk20a/ce2_gk20a.o \ | 208 | gk20a/ce2_gk20a.o \ |
208 | gk20a/fifo_gk20a.o \ | 209 | gk20a/fifo_gk20a.o \ |
209 | gk20a/channel_gk20a.o \ | ||
210 | gk20a/channel_sync_gk20a.o \ | 210 | gk20a/channel_sync_gk20a.o \ |
211 | gk20a/dbg_gpu_gk20a.o \ | 211 | gk20a/dbg_gpu_gk20a.o \ |
212 | gk20a/regops_gk20a.o \ | 212 | gk20a/regops_gk20a.o \ |
diff --git a/drivers/gpu/nvgpu/Makefile.sources b/drivers/gpu/nvgpu/Makefile.sources index 503e0f3a..f1ba7f76 100644 --- a/drivers/gpu/nvgpu/Makefile.sources +++ b/drivers/gpu/nvgpu/Makefile.sources | |||
@@ -39,7 +39,7 @@ srcs := os/posix/nvgpu.c \ | |||
39 | os/posix/error_notifier.c \ | 39 | os/posix/error_notifier.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/channel.c \ | 42 | os/posix/posix-channel.c \ |
43 | os/posix/tsg.c \ | 43 | os/posix/tsg.c \ |
44 | os/posix/nvlink.c \ | 44 | os/posix/nvlink.c \ |
45 | os/posix/lock.c \ | 45 | os/posix/lock.c \ |
@@ -104,6 +104,7 @@ srcs := os/posix/nvgpu.c \ | |||
104 | common/clock_gating/gv11b_gating_reglist.c \ | 104 | common/clock_gating/gv11b_gating_reglist.c \ |
105 | common/clock_gating/gp106_gating_reglist.c \ | 105 | common/clock_gating/gp106_gating_reglist.c \ |
106 | common/clock_gating/gv100_gating_reglist.c \ | 106 | common/clock_gating/gv100_gating_reglist.c \ |
107 | common/fifo/channel.c \ | ||
107 | common/fifo/submit.c \ | 108 | common/fifo/submit.c \ |
108 | boardobj/boardobj.c \ | 109 | boardobj/boardobj.c \ |
109 | boardobj/boardobjgrp.c \ | 110 | boardobj/boardobjgrp.c \ |
@@ -140,7 +141,6 @@ srcs := os/posix/nvgpu.c \ | |||
140 | common/ptimer/ptimer_gk20a.c \ | 141 | common/ptimer/ptimer_gk20a.c \ |
141 | gk20a/ce2_gk20a.c \ | 142 | gk20a/ce2_gk20a.c \ |
142 | gk20a/fifo_gk20a.c \ | 143 | gk20a/fifo_gk20a.c \ |
143 | gk20a/channel_gk20a.c \ | ||
144 | gk20a/channel_sync_gk20a.c \ | 144 | gk20a/channel_sync_gk20a.c \ |
145 | gk20a/dbg_gpu_gk20a.c \ | 145 | gk20a/dbg_gpu_gk20a.c \ |
146 | gk20a/regops_gk20a.c \ | 146 | gk20a/regops_gk20a.c \ |
diff --git a/drivers/gpu/nvgpu/gk20a/channel_gk20a.c b/drivers/gpu/nvgpu/common/fifo/channel.c index 77458917..5966e191 100644 --- a/drivers/gpu/nvgpu/gk20a/channel_gk20a.c +++ b/drivers/gpu/nvgpu/common/fifo/channel.c | |||
@@ -44,9 +44,9 @@ | |||
44 | #include <nvgpu/log2.h> | 44 | #include <nvgpu/log2.h> |
45 | #include <nvgpu/ptimer.h> | 45 | #include <nvgpu/ptimer.h> |
46 | 46 | ||
47 | #include "gk20a.h" | 47 | #include "gk20a/gk20a.h" |
48 | #include "dbg_gpu_gk20a.h" | 48 | #include "gk20a/dbg_gpu_gk20a.h" |
49 | #include "fence_gk20a.h" | 49 | #include "gk20a/fence_gk20a.h" |
50 | 50 | ||
51 | static void free_channel(struct fifo_gk20a *f, struct channel_gk20a *c); | 51 | static void free_channel(struct fifo_gk20a *f, struct channel_gk20a *c); |
52 | static void gk20a_channel_dump_ref_actions(struct channel_gk20a *c); | 52 | static void gk20a_channel_dump_ref_actions(struct channel_gk20a *c); |
diff --git a/drivers/gpu/nvgpu/os/linux/channel.c b/drivers/gpu/nvgpu/os/linux/linux-channel.c index fef44f2b..fef44f2b 100644 --- a/drivers/gpu/nvgpu/os/linux/channel.c +++ b/drivers/gpu/nvgpu/os/linux/linux-channel.c | |||
diff --git a/drivers/gpu/nvgpu/os/posix/channel.c b/drivers/gpu/nvgpu/os/posix/posix-channel.c index 05697159..05697159 100644 --- a/drivers/gpu/nvgpu/os/posix/channel.c +++ b/drivers/gpu/nvgpu/os/posix/posix-channel.c | |||