diff options
author | Konsta Holtta <kholtta@nvidia.com> | 2018-09-12 05:40:10 -0400 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2018-09-24 18:53:48 -0400 |
commit | c47eab005ad9a26a36d2c7ca1595c790ff1bc40d (patch) | |
tree | bfaa8f27f141a98478b664ba8b2ae5ba788546a6 /drivers/gpu/nvgpu/os | |
parent | 5c7a740403fe5b65149b8b30d1007fd02b33c890 (diff) |
gpu: nvgpu: move tsg code to common
tsg_gk20a.c doesn't depend on any specific hardware, so move it to the
common directory.
Rename the posix tsg file to posix-tsg.c.
Jira NVGPU-967
Change-Id: I6e8908a8f6cf43132db8dffe3a99e424e4f764b1
Signed-off-by: Konsta Holtta <kholtta@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1821509
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/os')
-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 |
4 files changed, 3 insertions, 4 deletions
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) |