diff options
53 files changed, 68 insertions, 70 deletions
diff --git a/drivers/gpu/nvgpu/include/nvgpu/semaphore.h b/drivers/gpu/nvgpu/include/nvgpu/semaphore.h index 3239551f..94e3be0c 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/semaphore.h +++ b/drivers/gpu/nvgpu/include/nvgpu/semaphore.h | |||
@@ -29,9 +29,10 @@ | |||
29 | #include <nvgpu/list.h> | 29 | #include <nvgpu/list.h> |
30 | #include <nvgpu/nvgpu_mem.h> | 30 | #include <nvgpu/nvgpu_mem.h> |
31 | 31 | ||
32 | #include "gk20a/gk20a.h" | ||
33 | #include "gk20a/mm_gk20a.h" | 32 | #include "gk20a/mm_gk20a.h" |
34 | 33 | ||
34 | struct gk20a; | ||
35 | |||
35 | #define gpu_sema_dbg(g, fmt, args...) \ | 36 | #define gpu_sema_dbg(g, fmt, args...) \ |
36 | nvgpu_log(g, gpu_dbg_sema, fmt, ##args) | 37 | nvgpu_log(g, gpu_dbg_sema, fmt, ##args) |
37 | #define gpu_sema_verbose_dbg(g, fmt, args...) \ | 38 | #define gpu_sema_verbose_dbg(g, fmt, args...) \ |
diff --git a/drivers/gpu/nvgpu/os/linux/cde.c b/drivers/gpu/nvgpu/os/linux/cde.c index 074fe5ce..a15ef560 100644 --- a/drivers/gpu/nvgpu/os/linux/cde.c +++ b/drivers/gpu/nvgpu/os/linux/cde.c | |||
@@ -34,10 +34,10 @@ | |||
34 | #include <nvgpu/os_sched.h> | 34 | #include <nvgpu/os_sched.h> |
35 | #include <nvgpu/channel.h> | 35 | #include <nvgpu/channel.h> |
36 | #include <nvgpu/utils.h> | 36 | #include <nvgpu/utils.h> |
37 | #include <nvgpu/gk20a.h> | ||
37 | 38 | ||
38 | #include <nvgpu/linux/vm.h> | 39 | #include <nvgpu/linux/vm.h> |
39 | 40 | ||
40 | #include "gk20a/gk20a.h" | ||
41 | #include "gk20a/mm_gk20a.h" | 41 | #include "gk20a/mm_gk20a.h" |
42 | #include "gk20a/fence_gk20a.h" | 42 | #include "gk20a/fence_gk20a.h" |
43 | #include "gk20a/gr_gk20a.h" | 43 | #include "gk20a/gr_gk20a.h" |
diff --git a/drivers/gpu/nvgpu/os/linux/cde_gm20b.c b/drivers/gpu/nvgpu/os/linux/cde_gm20b.c index 7f71b740..a9a4754d 100644 --- a/drivers/gpu/nvgpu/os/linux/cde_gm20b.c +++ b/drivers/gpu/nvgpu/os/linux/cde_gm20b.c | |||
@@ -22,7 +22,8 @@ | |||
22 | * DEALINGS IN THE SOFTWARE. | 22 | * DEALINGS IN THE SOFTWARE. |
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include "gk20a/gk20a.h" | 25 | #include <nvgpu/gk20a.h> |
26 | |||
26 | #include "cde_gm20b.h" | 27 | #include "cde_gm20b.h" |
27 | 28 | ||
28 | enum programs { | 29 | enum programs { |
diff --git a/drivers/gpu/nvgpu/os/linux/cde_gp10b.c b/drivers/gpu/nvgpu/os/linux/cde_gp10b.c index f22f4b68..6356d338 100644 --- a/drivers/gpu/nvgpu/os/linux/cde_gp10b.c +++ b/drivers/gpu/nvgpu/os/linux/cde_gp10b.c | |||
@@ -22,11 +22,11 @@ | |||
22 | * DEALINGS IN THE SOFTWARE. | 22 | * DEALINGS IN THE SOFTWARE. |
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include "gk20a/gk20a.h" | ||
26 | #include "cde_gp10b.h" | ||
27 | |||
28 | #include <nvgpu/log.h> | 25 | #include <nvgpu/log.h> |
29 | #include <nvgpu/dma.h> | 26 | #include <nvgpu/dma.h> |
27 | #include <nvgpu/gk20a.h> | ||
28 | |||
29 | #include "cde_gp10b.h" | ||
30 | 30 | ||
31 | enum gp10b_programs { | 31 | enum gp10b_programs { |
32 | GP10B_PROG_HPASS = 0, | 32 | GP10B_PROG_HPASS = 0, |
diff --git a/drivers/gpu/nvgpu/os/linux/clk.c b/drivers/gpu/nvgpu/os/linux/clk.c index cc420994..e76720ac 100644 --- a/drivers/gpu/nvgpu/os/linux/clk.c +++ b/drivers/gpu/nvgpu/os/linux/clk.c | |||
@@ -25,7 +25,7 @@ | |||
25 | #include "os_linux.h" | 25 | #include "os_linux.h" |
26 | #include "platform_gk20a.h" | 26 | #include "platform_gk20a.h" |
27 | 27 | ||
28 | #include "gk20a/gk20a.h" | 28 | #include <nvgpu/gk20a.h> |
29 | 29 | ||
30 | #define HZ_TO_MHZ(x) ((x) / 1000000) | 30 | #define HZ_TO_MHZ(x) ((x) / 1000000) |
31 | 31 | ||
diff --git a/drivers/gpu/nvgpu/os/linux/comptags.c b/drivers/gpu/nvgpu/os/linux/comptags.c index 353f6363..ab371972 100644 --- a/drivers/gpu/nvgpu/os/linux/comptags.c +++ b/drivers/gpu/nvgpu/os/linux/comptags.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (c) 2017, NVIDIA CORPORATION. All rights reserved. | 2 | * Copyright (c) 2017-2018, NVIDIA CORPORATION. All rights reserved. |
3 | * | 3 | * |
4 | * This program is free software; you can redistribute it and/or modify it | 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, | 5 | * under the terms and conditions of the GNU General Public License, |
@@ -17,10 +17,10 @@ | |||
17 | #include <linux/dma-buf.h> | 17 | #include <linux/dma-buf.h> |
18 | 18 | ||
19 | #include <nvgpu/comptags.h> | 19 | #include <nvgpu/comptags.h> |
20 | #include <nvgpu/gk20a.h> | ||
20 | 21 | ||
21 | #include <nvgpu/linux/vm.h> | 22 | #include <nvgpu/linux/vm.h> |
22 | 23 | ||
23 | #include "gk20a/gk20a.h" | ||
24 | #include "dmabuf.h" | 24 | #include "dmabuf.h" |
25 | 25 | ||
26 | void gk20a_get_comptags(struct nvgpu_os_buffer *buf, | 26 | void gk20a_get_comptags(struct nvgpu_os_buffer *buf, |
diff --git a/drivers/gpu/nvgpu/os/linux/ctxsw_trace.c b/drivers/gpu/nvgpu/os/linux/ctxsw_trace.c index aa5ed250..f5e53967 100644 --- a/drivers/gpu/nvgpu/os/linux/ctxsw_trace.c +++ b/drivers/gpu/nvgpu/os/linux/ctxsw_trace.c | |||
@@ -21,16 +21,15 @@ | |||
21 | #include <trace/events/gk20a.h> | 21 | #include <trace/events/gk20a.h> |
22 | #include <uapi/linux/nvgpu.h> | 22 | #include <uapi/linux/nvgpu.h> |
23 | #include <nvgpu/ctxsw_trace.h> | 23 | #include <nvgpu/ctxsw_trace.h> |
24 | #include <nvgpu/channel.h> | ||
25 | |||
26 | #include "gk20a/gk20a.h" | ||
27 | #include "gk20a/gr_gk20a.h" | ||
28 | #include "gk20a/fecs_trace_gk20a.h" | ||
29 | |||
30 | #include <nvgpu/kmem.h> | 24 | #include <nvgpu/kmem.h> |
31 | #include <nvgpu/log.h> | 25 | #include <nvgpu/log.h> |
32 | #include <nvgpu/atomic.h> | 26 | #include <nvgpu/atomic.h> |
33 | #include <nvgpu/barrier.h> | 27 | #include <nvgpu/barrier.h> |
28 | #include <nvgpu/gk20a.h> | ||
29 | #include <nvgpu/channel.h> | ||
30 | |||
31 | #include "gk20a/gr_gk20a.h" | ||
32 | #include "gk20a/fecs_trace_gk20a.h" | ||
34 | 33 | ||
35 | #include "platform_gk20a.h" | 34 | #include "platform_gk20a.h" |
36 | #include "os_linux.h" | 35 | #include "os_linux.h" |
diff --git a/drivers/gpu/nvgpu/os/linux/debug.c b/drivers/gpu/nvgpu/os/linux/debug.c index 9403e72e..5f0703c8 100644 --- a/drivers/gpu/nvgpu/os/linux/debug.c +++ b/drivers/gpu/nvgpu/os/linux/debug.c | |||
@@ -27,7 +27,7 @@ | |||
27 | #include "os_linux.h" | 27 | #include "os_linux.h" |
28 | #include "platform_gk20a.h" | 28 | #include "platform_gk20a.h" |
29 | 29 | ||
30 | #include "gk20a/gk20a.h" | 30 | #include <nvgpu/gk20a.h> |
31 | 31 | ||
32 | #include <linux/debugfs.h> | 32 | #include <linux/debugfs.h> |
33 | #include <linux/seq_file.h> | 33 | #include <linux/seq_file.h> |
diff --git a/drivers/gpu/nvgpu/os/linux/debug_ltc.c b/drivers/gpu/nvgpu/os/linux/debug_ltc.c index 88fb45f4..1b4c221c 100644 --- a/drivers/gpu/nvgpu/os/linux/debug_ltc.c +++ b/drivers/gpu/nvgpu/os/linux/debug_ltc.c | |||
@@ -14,7 +14,8 @@ | |||
14 | 14 | ||
15 | #include "debug_ltc.h" | 15 | #include "debug_ltc.h" |
16 | #include "os_linux.h" | 16 | #include "os_linux.h" |
17 | #include "gk20a/gk20a.h" | 17 | |
18 | #include <nvgpu/gk20a.h> | ||
18 | 19 | ||
19 | #include <linux/debugfs.h> | 20 | #include <linux/debugfs.h> |
20 | #include <linux/uaccess.h> | 21 | #include <linux/uaccess.h> |
diff --git a/drivers/gpu/nvgpu/os/linux/dmabuf.c b/drivers/gpu/nvgpu/os/linux/dmabuf.c index 591c7c0a..e8e33130 100644 --- a/drivers/gpu/nvgpu/os/linux/dmabuf.c +++ b/drivers/gpu/nvgpu/os/linux/dmabuf.c | |||
@@ -20,10 +20,10 @@ | |||
20 | 20 | ||
21 | #include <nvgpu/comptags.h> | 21 | #include <nvgpu/comptags.h> |
22 | #include <nvgpu/enabled.h> | 22 | #include <nvgpu/enabled.h> |
23 | #include <nvgpu/gk20a.h> | ||
23 | 24 | ||
24 | #include <nvgpu/linux/vm.h> | 25 | #include <nvgpu/linux/vm.h> |
25 | 26 | ||
26 | #include "gk20a/gk20a.h" | ||
27 | #include "gk20a/fence_gk20a.h" | 27 | #include "gk20a/fence_gk20a.h" |
28 | 28 | ||
29 | #include "platform_gk20a.h" | 29 | #include "platform_gk20a.h" |
diff --git a/drivers/gpu/nvgpu/os/linux/dmabuf_vidmem.c b/drivers/gpu/nvgpu/os/linux/dmabuf_vidmem.c index 572c2b0f..8b38a9e1 100644 --- a/drivers/gpu/nvgpu/os/linux/dmabuf_vidmem.c +++ b/drivers/gpu/nvgpu/os/linux/dmabuf_vidmem.c | |||
@@ -27,11 +27,11 @@ | |||
27 | #include <nvgpu/vidmem.h> | 27 | #include <nvgpu/vidmem.h> |
28 | #include <nvgpu/nvgpu_mem.h> | 28 | #include <nvgpu/nvgpu_mem.h> |
29 | #include <nvgpu/page_allocator.h> | 29 | #include <nvgpu/page_allocator.h> |
30 | #include <nvgpu/gk20a.h> | ||
30 | 31 | ||
31 | #include <nvgpu/linux/vm.h> | 32 | #include <nvgpu/linux/vm.h> |
32 | #include <nvgpu/linux/dma.h> | 33 | #include <nvgpu/linux/dma.h> |
33 | 34 | ||
34 | #include "gk20a/gk20a.h" | ||
35 | #include "gk20a/mm_gk20a.h" | 35 | #include "gk20a/mm_gk20a.h" |
36 | #include "dmabuf_vidmem.h" | 36 | #include "dmabuf_vidmem.h" |
37 | 37 | ||
diff --git a/drivers/gpu/nvgpu/os/linux/driver_common.c b/drivers/gpu/nvgpu/os/linux/driver_common.c index 0a25cd3f..9ff32d68 100644 --- a/drivers/gpu/nvgpu/os/linux/driver_common.c +++ b/drivers/gpu/nvgpu/os/linux/driver_common.c | |||
@@ -28,8 +28,8 @@ | |||
28 | #include <nvgpu/enabled.h> | 28 | #include <nvgpu/enabled.h> |
29 | #include <nvgpu/debug.h> | 29 | #include <nvgpu/debug.h> |
30 | #include <nvgpu/sizes.h> | 30 | #include <nvgpu/sizes.h> |
31 | #include <nvgpu/gk20a.h> | ||
31 | 32 | ||
32 | #include "gk20a/gk20a.h" | ||
33 | #include "platform_gk20a.h" | 33 | #include "platform_gk20a.h" |
34 | #include "module.h" | 34 | #include "module.h" |
35 | #include "os_linux.h" | 35 | #include "os_linux.h" |
diff --git a/drivers/gpu/nvgpu/os/linux/ecc_sysfs.c b/drivers/gpu/nvgpu/os/linux/ecc_sysfs.c index d2986d7d..73ae3dc2 100644 --- a/drivers/gpu/nvgpu/os/linux/ecc_sysfs.c +++ b/drivers/gpu/nvgpu/os/linux/ecc_sysfs.c | |||
@@ -15,8 +15,8 @@ | |||
15 | */ | 15 | */ |
16 | 16 | ||
17 | #include <nvgpu/ecc.h> | 17 | #include <nvgpu/ecc.h> |
18 | #include <nvgpu/gk20a.h> | ||
18 | 19 | ||
19 | #include "gk20a/gk20a.h" | ||
20 | #include "os_linux.h" | 20 | #include "os_linux.h" |
21 | 21 | ||
22 | int nvgpu_ecc_sysfs_init(struct gk20a *g) | 22 | int nvgpu_ecc_sysfs_init(struct gk20a *g) |
diff --git a/drivers/gpu/nvgpu/os/linux/firmware.c b/drivers/gpu/nvgpu/os/linux/firmware.c index 9a4dc653..8f0344be 100644 --- a/drivers/gpu/nvgpu/os/linux/firmware.c +++ b/drivers/gpu/nvgpu/os/linux/firmware.c | |||
@@ -19,8 +19,8 @@ | |||
19 | #include <nvgpu/kmem.h> | 19 | #include <nvgpu/kmem.h> |
20 | #include <nvgpu/bug.h> | 20 | #include <nvgpu/bug.h> |
21 | #include <nvgpu/firmware.h> | 21 | #include <nvgpu/firmware.h> |
22 | #include <nvgpu/gk20a.h> | ||
22 | 23 | ||
23 | #include "gk20a/gk20a.h" | ||
24 | #include "platform_gk20a.h" | 24 | #include "platform_gk20a.h" |
25 | #include "os_linux.h" | 25 | #include "os_linux.h" |
26 | 26 | ||
diff --git a/drivers/gpu/nvgpu/os/linux/intr.c b/drivers/gpu/nvgpu/os/linux/intr.c index 5ed6e35c..8838b728 100644 --- a/drivers/gpu/nvgpu/os/linux/intr.c +++ b/drivers/gpu/nvgpu/os/linux/intr.c | |||
@@ -14,7 +14,7 @@ | |||
14 | #include <trace/events/gk20a.h> | 14 | #include <trace/events/gk20a.h> |
15 | #include <linux/irqreturn.h> | 15 | #include <linux/irqreturn.h> |
16 | 16 | ||
17 | #include "gk20a/gk20a.h" | 17 | #include <nvgpu/gk20a.h> |
18 | 18 | ||
19 | #include <nvgpu/atomic.h> | 19 | #include <nvgpu/atomic.h> |
20 | #include <nvgpu/unit.h> | 20 | #include <nvgpu/unit.h> |
diff --git a/drivers/gpu/nvgpu/os/linux/io.c b/drivers/gpu/nvgpu/os/linux/io.c index 4b902f28..3e84e88d 100644 --- a/drivers/gpu/nvgpu/os/linux/io.c +++ b/drivers/gpu/nvgpu/os/linux/io.c | |||
@@ -13,9 +13,9 @@ | |||
13 | 13 | ||
14 | #include <nvgpu/io.h> | 14 | #include <nvgpu/io.h> |
15 | #include <nvgpu/types.h> | 15 | #include <nvgpu/types.h> |
16 | #include <nvgpu/gk20a.h> | ||
16 | 17 | ||
17 | #include "os_linux.h" | 18 | #include "os_linux.h" |
18 | #include "gk20a/gk20a.h" | ||
19 | 19 | ||
20 | void nvgpu_writel(struct gk20a *g, u32 r, u32 v) | 20 | void nvgpu_writel(struct gk20a *g, u32 r, u32 v) |
21 | { | 21 | { |
diff --git a/drivers/gpu/nvgpu/os/linux/io_usermode.c b/drivers/gpu/nvgpu/os/linux/io_usermode.c index ce7c9e75..ffc532f9 100644 --- a/drivers/gpu/nvgpu/os/linux/io_usermode.c +++ b/drivers/gpu/nvgpu/os/linux/io_usermode.c | |||
@@ -13,9 +13,9 @@ | |||
13 | 13 | ||
14 | #include <nvgpu/io.h> | 14 | #include <nvgpu/io.h> |
15 | #include <nvgpu/types.h> | 15 | #include <nvgpu/types.h> |
16 | #include <nvgpu/gk20a.h> | ||
16 | 17 | ||
17 | #include "os_linux.h" | 18 | #include "os_linux.h" |
18 | #include "gk20a/gk20a.h" | ||
19 | 19 | ||
20 | #include <nvgpu/hw/gv11b/hw_usermode_gv11b.h> | 20 | #include <nvgpu/hw/gv11b/hw_usermode_gv11b.h> |
21 | 21 | ||
diff --git a/drivers/gpu/nvgpu/os/linux/ioctl.c b/drivers/gpu/nvgpu/os/linux/ioctl.c index 359e5103..562500a6 100644 --- a/drivers/gpu/nvgpu/os/linux/ioctl.c +++ b/drivers/gpu/nvgpu/os/linux/ioctl.c | |||
@@ -20,8 +20,8 @@ | |||
20 | 20 | ||
21 | #include <nvgpu/nvgpu_common.h> | 21 | #include <nvgpu/nvgpu_common.h> |
22 | #include <nvgpu/ctxsw_trace.h> | 22 | #include <nvgpu/ctxsw_trace.h> |
23 | #include <nvgpu/gk20a.h> | ||
23 | 24 | ||
24 | #include "gk20a/gk20a.h" | ||
25 | #include "gk20a/dbg_gpu_gk20a.h" | 25 | #include "gk20a/dbg_gpu_gk20a.h" |
26 | 26 | ||
27 | #include "ioctl_channel.h" | 27 | #include "ioctl_channel.h" |
diff --git a/drivers/gpu/nvgpu/os/linux/ioctl_as.c b/drivers/gpu/nvgpu/os/linux/ioctl_as.c index 4e479e8e..f63a2317 100644 --- a/drivers/gpu/nvgpu/os/linux/ioctl_as.c +++ b/drivers/gpu/nvgpu/os/linux/ioctl_as.c | |||
@@ -24,11 +24,11 @@ | |||
24 | #include <nvgpu/gmmu.h> | 24 | #include <nvgpu/gmmu.h> |
25 | #include <nvgpu/vm_area.h> | 25 | #include <nvgpu/vm_area.h> |
26 | #include <nvgpu/log2.h> | 26 | #include <nvgpu/log2.h> |
27 | #include <nvgpu/gk20a.h> | ||
27 | #include <nvgpu/channel.h> | 28 | #include <nvgpu/channel.h> |
28 | 29 | ||
29 | #include <nvgpu/linux/vm.h> | 30 | #include <nvgpu/linux/vm.h> |
30 | 31 | ||
31 | #include "gk20a/gk20a.h" | ||
32 | #include "platform_gk20a.h" | 32 | #include "platform_gk20a.h" |
33 | #include "ioctl_as.h" | 33 | #include "ioctl_as.h" |
34 | #include "os_linux.h" | 34 | #include "os_linux.h" |
diff --git a/drivers/gpu/nvgpu/os/linux/ioctl_channel.c b/drivers/gpu/nvgpu/os/linux/ioctl_channel.c index 0f6843df..dd69c590 100644 --- a/drivers/gpu/nvgpu/os/linux/ioctl_channel.c +++ b/drivers/gpu/nvgpu/os/linux/ioctl_channel.c | |||
@@ -34,10 +34,10 @@ | |||
34 | #include <nvgpu/barrier.h> | 34 | #include <nvgpu/barrier.h> |
35 | #include <nvgpu/nvhost.h> | 35 | #include <nvgpu/nvhost.h> |
36 | #include <nvgpu/os_sched.h> | 36 | #include <nvgpu/os_sched.h> |
37 | #include <nvgpu/gk20a.h> | ||
37 | #include <nvgpu/channel.h> | 38 | #include <nvgpu/channel.h> |
38 | #include <nvgpu/channel_sync.h> | 39 | #include <nvgpu/channel_sync.h> |
39 | 40 | ||
40 | #include "gk20a/gk20a.h" | ||
41 | #include "gk20a/dbg_gpu_gk20a.h" | 41 | #include "gk20a/dbg_gpu_gk20a.h" |
42 | #include "gk20a/fence_gk20a.h" | 42 | #include "gk20a/fence_gk20a.h" |
43 | 43 | ||
diff --git a/drivers/gpu/nvgpu/os/linux/ioctl_clk_arb.c b/drivers/gpu/nvgpu/os/linux/ioctl_clk_arb.c index ff1cc00a..477222dc 100644 --- a/drivers/gpu/nvgpu/os/linux/ioctl_clk_arb.c +++ b/drivers/gpu/nvgpu/os/linux/ioctl_clk_arb.c | |||
@@ -35,8 +35,8 @@ | |||
35 | #include <nvgpu/cond.h> | 35 | #include <nvgpu/cond.h> |
36 | #include <nvgpu/list.h> | 36 | #include <nvgpu/list.h> |
37 | #include <nvgpu/clk_arb.h> | 37 | #include <nvgpu/clk_arb.h> |
38 | #include <nvgpu/gk20a.h> | ||
38 | 39 | ||
39 | #include "gk20a/gk20a.h" | ||
40 | #include "clk/clk.h" | 40 | #include "clk/clk.h" |
41 | #include "pstate/pstate.h" | 41 | #include "pstate/pstate.h" |
42 | #include "lpwr/lpwr.h" | 42 | #include "lpwr/lpwr.h" |
diff --git a/drivers/gpu/nvgpu/os/linux/ioctl_ctrl.c b/drivers/gpu/nvgpu/os/linux/ioctl_ctrl.c index e8ed63f4..227a7d57 100644 --- a/drivers/gpu/nvgpu/os/linux/ioctl_ctrl.c +++ b/drivers/gpu/nvgpu/os/linux/ioctl_ctrl.c | |||
@@ -31,6 +31,7 @@ | |||
31 | #include <nvgpu/sizes.h> | 31 | #include <nvgpu/sizes.h> |
32 | #include <nvgpu/list.h> | 32 | #include <nvgpu/list.h> |
33 | #include <nvgpu/clk_arb.h> | 33 | #include <nvgpu/clk_arb.h> |
34 | #include <nvgpu/gk20a.h> | ||
34 | #include <nvgpu/channel.h> | 35 | #include <nvgpu/channel.h> |
35 | 36 | ||
36 | #include "ioctl_ctrl.h" | 37 | #include "ioctl_ctrl.h" |
@@ -38,7 +39,6 @@ | |||
38 | #include "ioctl_as.h" | 39 | #include "ioctl_as.h" |
39 | #include "ioctl_tsg.h" | 40 | #include "ioctl_tsg.h" |
40 | #include "ioctl_channel.h" | 41 | #include "ioctl_channel.h" |
41 | #include "gk20a/gk20a.h" | ||
42 | #include "gk20a/fence_gk20a.h" | 42 | #include "gk20a/fence_gk20a.h" |
43 | 43 | ||
44 | #include "platform_gk20a.h" | 44 | #include "platform_gk20a.h" |
diff --git a/drivers/gpu/nvgpu/os/linux/ioctl_dbg.c b/drivers/gpu/nvgpu/os/linux/ioctl_dbg.c index 705434be..7bb170da 100644 --- a/drivers/gpu/nvgpu/os/linux/ioctl_dbg.c +++ b/drivers/gpu/nvgpu/os/linux/ioctl_dbg.c | |||
@@ -30,12 +30,12 @@ | |||
30 | #include <nvgpu/atomic.h> | 30 | #include <nvgpu/atomic.h> |
31 | #include <nvgpu/cond.h> | 31 | #include <nvgpu/cond.h> |
32 | #include <nvgpu/utils.h> | 32 | #include <nvgpu/utils.h> |
33 | #include <nvgpu/gk20a.h> | ||
33 | #include <nvgpu/channel.h> | 34 | #include <nvgpu/channel.h> |
34 | #include <nvgpu/tsg.h> | 35 | #include <nvgpu/tsg.h> |
35 | 36 | ||
36 | #include <nvgpu/linux/vm.h> | 37 | #include <nvgpu/linux/vm.h> |
37 | 38 | ||
38 | #include "gk20a/gk20a.h" | ||
39 | #include "gk20a/gr_gk20a.h" | 39 | #include "gk20a/gr_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" |
diff --git a/drivers/gpu/nvgpu/os/linux/ioctl_tsg.c b/drivers/gpu/nvgpu/os/linux/ioctl_tsg.c index 998a1544..8eb5f014 100644 --- a/drivers/gpu/nvgpu/os/linux/ioctl_tsg.c +++ b/drivers/gpu/nvgpu/os/linux/ioctl_tsg.c | |||
@@ -25,10 +25,10 @@ | |||
25 | #include <nvgpu/kmem.h> | 25 | #include <nvgpu/kmem.h> |
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/gk20a.h> | ||
28 | #include <nvgpu/channel.h> | 29 | #include <nvgpu/channel.h> |
29 | #include <nvgpu/tsg.h> | 30 | #include <nvgpu/tsg.h> |
30 | 31 | ||
31 | #include "gk20a/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/kmem.c b/drivers/gpu/nvgpu/os/linux/kmem.c index 86572bcc..395cc458 100644 --- a/drivers/gpu/nvgpu/os/linux/kmem.c +++ b/drivers/gpu/nvgpu/os/linux/kmem.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (c) 2017, NVIDIA CORPORATION. All rights reserved. | 2 | * Copyright (c) 2017-2018, NVIDIA CORPORATION. All rights reserved. |
3 | * | 3 | * |
4 | * This program is free software; you can redistribute it and/or modify it | 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, | 5 | * under the terms and conditions of the GNU General Public License, |
@@ -25,8 +25,7 @@ | |||
25 | #include <nvgpu/kmem.h> | 25 | #include <nvgpu/kmem.h> |
26 | #include <nvgpu/atomic.h> | 26 | #include <nvgpu/atomic.h> |
27 | #include <nvgpu/bug.h> | 27 | #include <nvgpu/bug.h> |
28 | 28 | #include <nvgpu/gk20a.h> | |
29 | #include "gk20a/gk20a.h" | ||
30 | 29 | ||
31 | #include "kmem_priv.h" | 30 | #include "kmem_priv.h" |
32 | 31 | ||
diff --git a/drivers/gpu/nvgpu/os/linux/linux-channel.c b/drivers/gpu/nvgpu/os/linux/linux-channel.c index 77c14b56..1fec3604 100644 --- a/drivers/gpu/nvgpu/os/linux/linux-channel.c +++ b/drivers/gpu/nvgpu/os/linux/linux-channel.c | |||
@@ -18,6 +18,7 @@ | |||
18 | #include <nvgpu/debug.h> | 18 | #include <nvgpu/debug.h> |
19 | #include <nvgpu/error_notifier.h> | 19 | #include <nvgpu/error_notifier.h> |
20 | #include <nvgpu/os_sched.h> | 20 | #include <nvgpu/os_sched.h> |
21 | #include <nvgpu/gk20a.h> | ||
21 | #include <nvgpu/channel.h> | 22 | #include <nvgpu/channel.h> |
22 | 23 | ||
23 | /* | 24 | /* |
@@ -27,8 +28,6 @@ | |||
27 | */ | 28 | */ |
28 | #include <nvgpu/linux/vm.h> | 29 | #include <nvgpu/linux/vm.h> |
29 | 30 | ||
30 | #include "gk20a/gk20a.h" | ||
31 | |||
32 | #include "channel.h" | 31 | #include "channel.h" |
33 | #include "ioctl_channel.h" | 32 | #include "ioctl_channel.h" |
34 | #include "os_linux.h" | 33 | #include "os_linux.h" |
diff --git a/drivers/gpu/nvgpu/os/linux/linux-dma.c b/drivers/gpu/nvgpu/os/linux/linux-dma.c index a42e7cb5..52987a87 100644 --- a/drivers/gpu/nvgpu/os/linux/linux-dma.c +++ b/drivers/gpu/nvgpu/os/linux/linux-dma.c | |||
@@ -25,11 +25,10 @@ | |||
25 | #include <nvgpu/kmem.h> | 25 | #include <nvgpu/kmem.h> |
26 | #include <nvgpu/enabled.h> | 26 | #include <nvgpu/enabled.h> |
27 | #include <nvgpu/vidmem.h> | 27 | #include <nvgpu/vidmem.h> |
28 | #include <nvgpu/gk20a.h> | ||
28 | 29 | ||
29 | #include <nvgpu/linux/dma.h> | 30 | #include <nvgpu/linux/dma.h> |
30 | 31 | ||
31 | #include "gk20a/gk20a.h" | ||
32 | |||
33 | #include "platform_gk20a.h" | 32 | #include "platform_gk20a.h" |
34 | #include "os_linux.h" | 33 | #include "os_linux.h" |
35 | #include "dmabuf_vidmem.h" | 34 | #include "dmabuf_vidmem.h" |
diff --git a/drivers/gpu/nvgpu/os/linux/log.c b/drivers/gpu/nvgpu/os/linux/log.c index ca29e0f3..bd9f67da 100644 --- a/drivers/gpu/nvgpu/os/linux/log.c +++ b/drivers/gpu/nvgpu/os/linux/log.c | |||
@@ -18,8 +18,8 @@ | |||
18 | #include <linux/device.h> | 18 | #include <linux/device.h> |
19 | 19 | ||
20 | #include <nvgpu/log.h> | 20 | #include <nvgpu/log.h> |
21 | #include <nvgpu/gk20a.h> | ||
21 | 22 | ||
22 | #include "gk20a/gk20a.h" | ||
23 | #include "platform_gk20a.h" | 23 | #include "platform_gk20a.h" |
24 | #include "os_linux.h" | 24 | #include "os_linux.h" |
25 | 25 | ||
diff --git a/drivers/gpu/nvgpu/os/linux/ltc.c b/drivers/gpu/nvgpu/os/linux/ltc.c index 8011f762..baeb20b2 100644 --- a/drivers/gpu/nvgpu/os/linux/ltc.c +++ b/drivers/gpu/nvgpu/os/linux/ltc.c | |||
@@ -23,8 +23,8 @@ | |||
23 | #include <nvgpu/ltc.h> | 23 | #include <nvgpu/ltc.h> |
24 | #include <nvgpu/dma.h> | 24 | #include <nvgpu/dma.h> |
25 | #include <nvgpu/nvgpu_mem.h> | 25 | #include <nvgpu/nvgpu_mem.h> |
26 | #include <nvgpu/gk20a.h> | ||
26 | 27 | ||
27 | #include "gk20a/gk20a.h" | ||
28 | #include "gk20a/gr_gk20a.h" | 28 | #include "gk20a/gr_gk20a.h" |
29 | 29 | ||
30 | int nvgpu_ltc_alloc_cbc(struct gk20a *g, size_t compbit_backing_size, | 30 | int nvgpu_ltc_alloc_cbc(struct gk20a *g, size_t compbit_backing_size, |
diff --git a/drivers/gpu/nvgpu/os/linux/nvgpu_mem.c b/drivers/gpu/nvgpu/os/linux/nvgpu_mem.c index c57e3fdf..d6a3189e 100644 --- a/drivers/gpu/nvgpu/os/linux/nvgpu_mem.c +++ b/drivers/gpu/nvgpu/os/linux/nvgpu_mem.c | |||
@@ -23,6 +23,7 @@ | |||
23 | #include <nvgpu/enabled.h> | 23 | #include <nvgpu/enabled.h> |
24 | #include <nvgpu/kmem.h> | 24 | #include <nvgpu/kmem.h> |
25 | #include <nvgpu/vidmem.h> | 25 | #include <nvgpu/vidmem.h> |
26 | #include <nvgpu/gk20a.h> | ||
26 | 27 | ||
27 | #include <nvgpu/linux/dma.h> | 28 | #include <nvgpu/linux/dma.h> |
28 | 29 | ||
@@ -32,7 +33,6 @@ | |||
32 | #include "os_linux.h" | 33 | #include "os_linux.h" |
33 | #include "dmabuf_vidmem.h" | 34 | #include "dmabuf_vidmem.h" |
34 | 35 | ||
35 | #include "gk20a/gk20a.h" | ||
36 | #include "gk20a/mm_gk20a.h" | 36 | #include "gk20a/mm_gk20a.h" |
37 | #include "platform_gk20a.h" | 37 | #include "platform_gk20a.h" |
38 | 38 | ||
diff --git a/drivers/gpu/nvgpu/os/linux/nvhost.c b/drivers/gpu/nvgpu/os/linux/nvhost.c index 6ab60248..ccb830cc 100644 --- a/drivers/gpu/nvgpu/os/linux/nvhost.c +++ b/drivers/gpu/nvgpu/os/linux/nvhost.c | |||
@@ -19,11 +19,11 @@ | |||
19 | #include <linux/nvhost_ioctl.h> | 19 | #include <linux/nvhost_ioctl.h> |
20 | #include <linux/of_platform.h> | 20 | #include <linux/of_platform.h> |
21 | 21 | ||
22 | #include <nvgpu/gk20a.h> | ||
22 | #include <nvgpu/nvhost.h> | 23 | #include <nvgpu/nvhost.h> |
23 | 24 | ||
24 | #include "nvhost_priv.h" | 25 | #include "nvhost_priv.h" |
25 | 26 | ||
26 | #include "gk20a/gk20a.h" | ||
27 | #include "os_linux.h" | 27 | #include "os_linux.h" |
28 | #include "module.h" | 28 | #include "module.h" |
29 | 29 | ||
diff --git a/drivers/gpu/nvgpu/os/linux/nvlink.c b/drivers/gpu/nvgpu/os/linux/nvlink.c index 0db483d6..dd7c02c0 100644 --- a/drivers/gpu/nvgpu/os/linux/nvlink.c +++ b/drivers/gpu/nvgpu/os/linux/nvlink.c | |||
@@ -18,7 +18,7 @@ | |||
18 | #include <linux/platform/tegra/tegra-nvlink.h> | 18 | #include <linux/platform/tegra/tegra-nvlink.h> |
19 | #endif | 19 | #endif |
20 | 20 | ||
21 | #include <gk20a/gk20a.h> | 21 | #include <nvgpu/gk20a.h> |
22 | #include <nvgpu/nvlink.h> | 22 | #include <nvgpu/nvlink.h> |
23 | #include <nvgpu/enabled.h> | 23 | #include <nvgpu/enabled.h> |
24 | #include "module.h" | 24 | #include "module.h" |
diff --git a/drivers/gpu/nvgpu/os/linux/os_fence_android.c b/drivers/gpu/nvgpu/os/linux/os_fence_android.c index 297b3b20..013989eb 100644 --- a/drivers/gpu/nvgpu/os/linux/os_fence_android.c +++ b/drivers/gpu/nvgpu/os/linux/os_fence_android.c | |||
@@ -16,10 +16,9 @@ | |||
16 | #include <nvgpu/types.h> | 16 | #include <nvgpu/types.h> |
17 | #include <nvgpu/os_fence.h> | 17 | #include <nvgpu/os_fence.h> |
18 | #include <nvgpu/linux/os_fence_android.h> | 18 | #include <nvgpu/linux/os_fence_android.h> |
19 | #include <nvgpu/gk20a.h> | ||
19 | #include <nvgpu/channel.h> | 20 | #include <nvgpu/channel.h> |
20 | 21 | ||
21 | #include "gk20a/gk20a.h" | ||
22 | |||
23 | #include "../drivers/staging/android/sync.h" | 22 | #include "../drivers/staging/android/sync.h" |
24 | 23 | ||
25 | inline struct sync_fence *nvgpu_get_sync_fence(struct nvgpu_os_fence *s) | 24 | inline struct sync_fence *nvgpu_get_sync_fence(struct nvgpu_os_fence *s) |
diff --git a/drivers/gpu/nvgpu/os/linux/os_fence_android_sema.c b/drivers/gpu/nvgpu/os/linux/os_fence_android_sema.c index 195da64a..ec3de12b 100644 --- a/drivers/gpu/nvgpu/os/linux/os_fence_android_sema.c +++ b/drivers/gpu/nvgpu/os/linux/os_fence_android_sema.c | |||
@@ -20,6 +20,7 @@ | |||
20 | #include <nvgpu/os_fence.h> | 20 | #include <nvgpu/os_fence.h> |
21 | #include <nvgpu/linux/os_fence_android.h> | 21 | #include <nvgpu/linux/os_fence_android.h> |
22 | #include <nvgpu/semaphore.h> | 22 | #include <nvgpu/semaphore.h> |
23 | #include <nvgpu/gk20a.h> | ||
23 | #include <nvgpu/channel.h> | 24 | #include <nvgpu/channel.h> |
24 | #include <nvgpu/channel_sync.h> | 25 | #include <nvgpu/channel_sync.h> |
25 | 26 | ||
diff --git a/drivers/gpu/nvgpu/os/linux/os_fence_android_syncpt.c b/drivers/gpu/nvgpu/os/linux/os_fence_android_syncpt.c index fe09db8f..30655967 100644 --- a/drivers/gpu/nvgpu/os/linux/os_fence_android_syncpt.c +++ b/drivers/gpu/nvgpu/os/linux/os_fence_android_syncpt.c | |||
@@ -22,10 +22,10 @@ | |||
22 | #include <nvgpu/linux/os_fence_android.h> | 22 | #include <nvgpu/linux/os_fence_android.h> |
23 | #include <nvgpu/nvhost.h> | 23 | #include <nvgpu/nvhost.h> |
24 | #include <nvgpu/atomic.h> | 24 | #include <nvgpu/atomic.h> |
25 | #include <nvgpu/gk20a.h> | ||
25 | #include <nvgpu/channel.h> | 26 | #include <nvgpu/channel.h> |
26 | #include <nvgpu/channel_sync.h> | 27 | #include <nvgpu/channel_sync.h> |
27 | 28 | ||
28 | #include "gk20a/gk20a.h" | ||
29 | #include "gk20a/mm_gk20a.h" | 29 | #include "gk20a/mm_gk20a.h" |
30 | 30 | ||
31 | #include "../drivers/staging/android/sync.h" | 31 | #include "../drivers/staging/android/sync.h" |
diff --git a/drivers/gpu/nvgpu/os/linux/os_linux.h b/drivers/gpu/nvgpu/os/linux/os_linux.h index a9a9ebb6..5f636f49 100644 --- a/drivers/gpu/nvgpu/os/linux/os_linux.h +++ b/drivers/gpu/nvgpu/os/linux/os_linux.h | |||
@@ -21,7 +21,8 @@ | |||
21 | #include <linux/iommu.h> | 21 | #include <linux/iommu.h> |
22 | #include <linux/hashtable.h> | 22 | #include <linux/hashtable.h> |
23 | 23 | ||
24 | #include "gk20a/gk20a.h" | 24 | #include <nvgpu/gk20a.h> |
25 | |||
25 | #include "cde.h" | 26 | #include "cde.h" |
26 | #include "sched.h" | 27 | #include "sched.h" |
27 | 28 | ||
diff --git a/drivers/gpu/nvgpu/os/linux/pci.c b/drivers/gpu/nvgpu/os/linux/pci.c index 79a30495..2a2cd077 100644 --- a/drivers/gpu/nvgpu/os/linux/pci.c +++ b/drivers/gpu/nvgpu/os/linux/pci.c | |||
@@ -27,9 +27,9 @@ | |||
27 | #include <nvgpu/nvlink.h> | 27 | #include <nvgpu/nvlink.h> |
28 | #include <nvgpu/soc.h> | 28 | #include <nvgpu/soc.h> |
29 | #include <nvgpu/sim.h> | 29 | #include <nvgpu/sim.h> |
30 | #include <nvgpu/gk20a.h> | ||
30 | 31 | ||
31 | #include "nvlink.h" | 32 | #include "nvlink.h" |
32 | #include "gk20a/gk20a.h" | ||
33 | #include "clk/clk.h" | 33 | #include "clk/clk.h" |
34 | #include "clk/clk_mclk.h" | 34 | #include "clk/clk_mclk.h" |
35 | #include "module.h" | 35 | #include "module.h" |
diff --git a/drivers/gpu/nvgpu/os/linux/platform_gk20a.h b/drivers/gpu/nvgpu/os/linux/platform_gk20a.h index b5beeefe..3a0227a1 100644 --- a/drivers/gpu/nvgpu/os/linux/platform_gk20a.h +++ b/drivers/gpu/nvgpu/os/linux/platform_gk20a.h | |||
@@ -19,8 +19,7 @@ | |||
19 | #include <linux/device.h> | 19 | #include <linux/device.h> |
20 | 20 | ||
21 | #include <nvgpu/lock.h> | 21 | #include <nvgpu/lock.h> |
22 | 22 | #include <nvgpu/gk20a.h> | |
23 | #include "gk20a/gk20a.h" | ||
24 | 23 | ||
25 | #define GK20A_CLKS_MAX 4 | 24 | #define GK20A_CLKS_MAX 4 |
26 | 25 | ||
diff --git a/drivers/gpu/nvgpu/os/linux/platform_gk20a_tegra.c b/drivers/gpu/nvgpu/os/linux/platform_gk20a_tegra.c index 033563dc..408e546f 100644 --- a/drivers/gpu/nvgpu/os/linux/platform_gk20a_tegra.c +++ b/drivers/gpu/nvgpu/os/linux/platform_gk20a_tegra.c | |||
@@ -42,11 +42,11 @@ | |||
42 | #include <nvgpu/kmem.h> | 42 | #include <nvgpu/kmem.h> |
43 | #include <nvgpu/bug.h> | 43 | #include <nvgpu/bug.h> |
44 | #include <nvgpu/enabled.h> | 44 | #include <nvgpu/enabled.h> |
45 | #include <nvgpu/gk20a.h> | ||
45 | #include <nvgpu/nvhost.h> | 46 | #include <nvgpu/nvhost.h> |
46 | 47 | ||
47 | #include <nvgpu/linux/dma.h> | 48 | #include <nvgpu/linux/dma.h> |
48 | 49 | ||
49 | #include "gk20a/gk20a.h" | ||
50 | #include "gm20b/clk_gm20b.h" | 50 | #include "gm20b/clk_gm20b.h" |
51 | 51 | ||
52 | #include "scale.h" | 52 | #include "scale.h" |
diff --git a/drivers/gpu/nvgpu/os/linux/platform_gp10b_tegra.c b/drivers/gpu/nvgpu/os/linux/platform_gp10b_tegra.c index a792bfcb..a8308496 100644 --- a/drivers/gpu/nvgpu/os/linux/platform_gp10b_tegra.c +++ b/drivers/gpu/nvgpu/os/linux/platform_gp10b_tegra.c | |||
@@ -32,14 +32,13 @@ | |||
32 | #include <nvgpu/bug.h> | 32 | #include <nvgpu/bug.h> |
33 | #include <nvgpu/enabled.h> | 33 | #include <nvgpu/enabled.h> |
34 | #include <nvgpu/hashtable.h> | 34 | #include <nvgpu/hashtable.h> |
35 | #include <nvgpu/gk20a.h> | ||
35 | #include <nvgpu/nvhost.h> | 36 | #include <nvgpu/nvhost.h> |
36 | 37 | ||
37 | #include "os_linux.h" | 38 | #include "os_linux.h" |
38 | 39 | ||
39 | #include "clk.h" | 40 | #include "clk.h" |
40 | 41 | ||
41 | #include "gk20a/gk20a.h" | ||
42 | |||
43 | #include "platform_gk20a.h" | 42 | #include "platform_gk20a.h" |
44 | #include "platform_gk20a_tegra.h" | 43 | #include "platform_gk20a_tegra.h" |
45 | #include "platform_gp10b.h" | 44 | #include "platform_gp10b.h" |
diff --git a/drivers/gpu/nvgpu/os/linux/platform_gv11b_tegra.c b/drivers/gpu/nvgpu/os/linux/platform_gv11b_tegra.c index ec93b4c3..41cba0f0 100644 --- a/drivers/gpu/nvgpu/os/linux/platform_gv11b_tegra.c +++ b/drivers/gpu/nvgpu/os/linux/platform_gv11b_tegra.c | |||
@@ -25,6 +25,7 @@ | |||
25 | #include <linux/clk.h> | 25 | #include <linux/clk.h> |
26 | #include <linux/platform/tegra/emc_bwmgr.h> | 26 | #include <linux/platform/tegra/emc_bwmgr.h> |
27 | 27 | ||
28 | #include <nvgpu/gk20a.h> | ||
28 | #include <nvgpu/nvhost.h> | 29 | #include <nvgpu/nvhost.h> |
29 | 30 | ||
30 | #include <uapi/linux/nvgpu.h> | 31 | #include <uapi/linux/nvgpu.h> |
@@ -32,7 +33,6 @@ | |||
32 | #include <soc/tegra/tegra_bpmp.h> | 33 | #include <soc/tegra/tegra_bpmp.h> |
33 | #include <soc/tegra/tegra_powergate.h> | 34 | #include <soc/tegra/tegra_powergate.h> |
34 | 35 | ||
35 | #include "gk20a/gk20a.h" | ||
36 | #include "platform_gk20a.h" | 36 | #include "platform_gk20a.h" |
37 | #include "clk.h" | 37 | #include "clk.h" |
38 | #include "scale.h" | 38 | #include "scale.h" |
diff --git a/drivers/gpu/nvgpu/os/linux/scale.c b/drivers/gpu/nvgpu/os/linux/scale.c index cbb9fdc5..d7a961c7 100644 --- a/drivers/gpu/nvgpu/os/linux/scale.c +++ b/drivers/gpu/nvgpu/os/linux/scale.c | |||
@@ -25,9 +25,9 @@ | |||
25 | 25 | ||
26 | #include <nvgpu/kmem.h> | 26 | #include <nvgpu/kmem.h> |
27 | #include <nvgpu/log.h> | 27 | #include <nvgpu/log.h> |
28 | #include <nvgpu/gk20a.h> | ||
28 | #include <nvgpu/clk_arb.h> | 29 | #include <nvgpu/clk_arb.h> |
29 | 30 | ||
30 | #include "gk20a/gk20a.h" | ||
31 | #include "platform_gk20a.h" | 31 | #include "platform_gk20a.h" |
32 | #include "scale.h" | 32 | #include "scale.h" |
33 | #include "os_linux.h" | 33 | #include "os_linux.h" |
diff --git a/drivers/gpu/nvgpu/os/linux/sched.c b/drivers/gpu/nvgpu/os/linux/sched.c index 2ad5aabf..3cf61644 100644 --- a/drivers/gpu/nvgpu/os/linux/sched.c +++ b/drivers/gpu/nvgpu/os/linux/sched.c | |||
@@ -23,8 +23,8 @@ | |||
23 | #include <nvgpu/log.h> | 23 | #include <nvgpu/log.h> |
24 | #include <nvgpu/bug.h> | 24 | #include <nvgpu/bug.h> |
25 | #include <nvgpu/barrier.h> | 25 | #include <nvgpu/barrier.h> |
26 | #include <nvgpu/gk20a.h> | ||
26 | 27 | ||
27 | #include "gk20a/gk20a.h" | ||
28 | #include "gk20a/gr_gk20a.h" | 28 | #include "gk20a/gr_gk20a.h" |
29 | #include "sched.h" | 29 | #include "sched.h" |
30 | #include "os_linux.h" | 30 | #include "os_linux.h" |
diff --git a/drivers/gpu/nvgpu/os/linux/sim.c b/drivers/gpu/nvgpu/os/linux/sim.c index abef45c7..792ce80e 100644 --- a/drivers/gpu/nvgpu/os/linux/sim.c +++ b/drivers/gpu/nvgpu/os/linux/sim.c | |||
@@ -26,7 +26,8 @@ | |||
26 | #include <nvgpu/soc.h> | 26 | #include <nvgpu/soc.h> |
27 | #include <nvgpu/hw_sim.h> | 27 | #include <nvgpu/hw_sim.h> |
28 | #include <nvgpu/sim.h> | 28 | #include <nvgpu/sim.h> |
29 | #include "gk20a/gk20a.h" | 29 | #include <nvgpu/gk20a.h> |
30 | |||
30 | #include "platform_gk20a.h" | 31 | #include "platform_gk20a.h" |
31 | #include "os_linux.h" | 32 | #include "os_linux.h" |
32 | #include "module.h" | 33 | #include "module.h" |
diff --git a/drivers/gpu/nvgpu/os/linux/sim_pci.c b/drivers/gpu/nvgpu/os/linux/sim_pci.c index 8b192e28..340f1fab 100644 --- a/drivers/gpu/nvgpu/os/linux/sim_pci.c +++ b/drivers/gpu/nvgpu/os/linux/sim_pci.c | |||
@@ -26,7 +26,8 @@ | |||
26 | #include <nvgpu/hw_sim_pci.h> | 26 | #include <nvgpu/hw_sim_pci.h> |
27 | #include <nvgpu/sim.h> | 27 | #include <nvgpu/sim.h> |
28 | #include <nvgpu/io.h> | 28 | #include <nvgpu/io.h> |
29 | #include "gk20a/gk20a.h" | 29 | #include <nvgpu/gk20a.h> |
30 | |||
30 | #include "os_linux.h" | 31 | #include "os_linux.h" |
31 | #include "module.h" | 32 | #include "module.h" |
32 | 33 | ||
diff --git a/drivers/gpu/nvgpu/os/linux/timers.c b/drivers/gpu/nvgpu/os/linux/timers.c index d1aa641f..018fd2d8 100644 --- a/drivers/gpu/nvgpu/os/linux/timers.c +++ b/drivers/gpu/nvgpu/os/linux/timers.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (c) 2016-2017, NVIDIA CORPORATION. All rights reserved. | 2 | * Copyright (c) 2016-2018, NVIDIA CORPORATION. All rights reserved. |
3 | * | 3 | * |
4 | * This program is free software; you can redistribute it and/or modify it | 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, | 5 | * under the terms and conditions of the GNU General Public License, |
@@ -19,8 +19,7 @@ | |||
19 | 19 | ||
20 | #include <nvgpu/timers.h> | 20 | #include <nvgpu/timers.h> |
21 | #include <nvgpu/soc.h> | 21 | #include <nvgpu/soc.h> |
22 | 22 | #include <nvgpu/gk20a.h> | |
23 | #include "gk20a/gk20a.h" | ||
24 | 23 | ||
25 | #include "platform_gk20a.h" | 24 | #include "platform_gk20a.h" |
26 | 25 | ||
diff --git a/drivers/gpu/nvgpu/os/linux/vgpu/fecs_trace_vgpu.c b/drivers/gpu/nvgpu/os/linux/vgpu/fecs_trace_vgpu.c index c878316a..02a381e1 100644 --- a/drivers/gpu/nvgpu/os/linux/vgpu/fecs_trace_vgpu.c +++ b/drivers/gpu/nvgpu/os/linux/vgpu/fecs_trace_vgpu.c | |||
@@ -23,8 +23,8 @@ | |||
23 | #include <nvgpu/vgpu/vgpu_ivm.h> | 23 | #include <nvgpu/vgpu/vgpu_ivm.h> |
24 | #include <nvgpu/vgpu/tegra_vgpu.h> | 24 | #include <nvgpu/vgpu/tegra_vgpu.h> |
25 | #include <nvgpu/vgpu/vgpu.h> | 25 | #include <nvgpu/vgpu/vgpu.h> |
26 | #include <nvgpu/gk20a.h> | ||
26 | 27 | ||
27 | #include "gk20a/gk20a.h" | ||
28 | #include "os/linux/os_linux.h" | 28 | #include "os/linux/os_linux.h" |
29 | #include "gk20a/fecs_trace_gk20a.h" | 29 | #include "gk20a/fecs_trace_gk20a.h" |
30 | #include "vgpu/fecs_trace_vgpu.h" | 30 | #include "vgpu/fecs_trace_vgpu.h" |
diff --git a/drivers/gpu/nvgpu/os/linux/vgpu/gv11b/platform_gv11b_vgpu_tegra.c b/drivers/gpu/nvgpu/os/linux/vgpu/gv11b/platform_gv11b_vgpu_tegra.c index e662877d..0304bccb 100644 --- a/drivers/gpu/nvgpu/os/linux/vgpu/gv11b/platform_gv11b_vgpu_tegra.c +++ b/drivers/gpu/nvgpu/os/linux/vgpu/gv11b/platform_gv11b_vgpu_tegra.c | |||
@@ -17,8 +17,8 @@ | |||
17 | #include <linux/platform_device.h> | 17 | #include <linux/platform_device.h> |
18 | 18 | ||
19 | #include <nvgpu/nvhost.h> | 19 | #include <nvgpu/nvhost.h> |
20 | #include <nvgpu/gk20a.h> | ||
20 | 21 | ||
21 | #include "gk20a/gk20a.h" | ||
22 | #include "vgpu/clk_vgpu.h" | 22 | #include "vgpu/clk_vgpu.h" |
23 | #include "os/linux/platform_gk20a.h" | 23 | #include "os/linux/platform_gk20a.h" |
24 | #include "os/linux/os_linux.h" | 24 | #include "os/linux/os_linux.h" |
diff --git a/drivers/gpu/nvgpu/os/linux/vgpu/platform_vgpu_tegra.c b/drivers/gpu/nvgpu/os/linux/vgpu/platform_vgpu_tegra.c index 25b76988..948323ef 100644 --- a/drivers/gpu/nvgpu/os/linux/vgpu/platform_vgpu_tegra.c +++ b/drivers/gpu/nvgpu/os/linux/vgpu/platform_vgpu_tegra.c | |||
@@ -17,8 +17,8 @@ | |||
17 | */ | 17 | */ |
18 | 18 | ||
19 | #include <nvgpu/nvhost.h> | 19 | #include <nvgpu/nvhost.h> |
20 | #include <nvgpu/gk20a.h> | ||
20 | 21 | ||
21 | #include "gk20a/gk20a.h" | ||
22 | #include "os/linux/platform_gk20a.h" | 22 | #include "os/linux/platform_gk20a.h" |
23 | #include "vgpu/clk_vgpu.h" | 23 | #include "vgpu/clk_vgpu.h" |
24 | #include "vgpu_linux.h" | 24 | #include "vgpu_linux.h" |
diff --git a/drivers/gpu/nvgpu/os/linux/vm.c b/drivers/gpu/nvgpu/os/linux/vm.c index ef6015d8..97dd0671 100644 --- a/drivers/gpu/nvgpu/os/linux/vm.c +++ b/drivers/gpu/nvgpu/os/linux/vm.c | |||
@@ -26,11 +26,11 @@ | |||
26 | #include <nvgpu/page_allocator.h> | 26 | #include <nvgpu/page_allocator.h> |
27 | #include <nvgpu/vidmem.h> | 27 | #include <nvgpu/vidmem.h> |
28 | #include <nvgpu/utils.h> | 28 | #include <nvgpu/utils.h> |
29 | #include <nvgpu/gk20a.h> | ||
29 | 30 | ||
30 | #include <nvgpu/linux/vm.h> | 31 | #include <nvgpu/linux/vm.h> |
31 | #include <nvgpu/linux/nvgpu_mem.h> | 32 | #include <nvgpu/linux/nvgpu_mem.h> |
32 | 33 | ||
33 | #include "gk20a/gk20a.h" | ||
34 | #include "gk20a/mm_gk20a.h" | 34 | #include "gk20a/mm_gk20a.h" |
35 | 35 | ||
36 | #include "platform_gk20a.h" | 36 | #include "platform_gk20a.h" |
diff --git a/drivers/gpu/nvgpu/os/posix/log.c b/drivers/gpu/nvgpu/os/posix/log.c index 6bfb673c..35d26266 100644 --- a/drivers/gpu/nvgpu/os/posix/log.c +++ b/drivers/gpu/nvgpu/os/posix/log.c | |||
@@ -23,7 +23,7 @@ | |||
23 | #include <nvgpu/log.h> | 23 | #include <nvgpu/log.h> |
24 | #include <nvgpu/types.h> | 24 | #include <nvgpu/types.h> |
25 | 25 | ||
26 | #include "gk20a/gk20a.h" | 26 | #include <nvgpu/gk20a.h> |
27 | 27 | ||
28 | /* | 28 | /* |
29 | * Define a length for log buffers. This is the buffer that the 'fmt, ...' part | 29 | * Define a length for log buffers. This is the buffer that the 'fmt, ...' part |
diff --git a/drivers/gpu/nvgpu/os/posix/nvgpu.c b/drivers/gpu/nvgpu/os/posix/nvgpu.c index a275f2de..2f84dc6e 100644 --- a/drivers/gpu/nvgpu/os/posix/nvgpu.c +++ b/drivers/gpu/nvgpu/os/posix/nvgpu.c | |||
@@ -29,13 +29,12 @@ | |||
29 | #include <nvgpu/atomic.h> | 29 | #include <nvgpu/atomic.h> |
30 | #include <nvgpu/nvgpu_common.h> | 30 | #include <nvgpu/nvgpu_common.h> |
31 | #include <nvgpu/os_sched.h> | 31 | #include <nvgpu/os_sched.h> |
32 | #include <nvgpu/gk20a.h> | ||
32 | 33 | ||
33 | #include <nvgpu/posix/probe.h> | 34 | #include <nvgpu/posix/probe.h> |
34 | 35 | ||
35 | #include "os_posix.h" | 36 | #include "os_posix.h" |
36 | 37 | ||
37 | #include "gk20a/gk20a.h" | ||
38 | |||
39 | void nvgpu_wait_for_deferred_interrupts(struct gk20a *g) | 38 | void nvgpu_wait_for_deferred_interrupts(struct gk20a *g) |
40 | { | 39 | { |
41 | /* | 40 | /* |
diff --git a/drivers/gpu/nvgpu/os/posix/os_posix.h b/drivers/gpu/nvgpu/os/posix/os_posix.h index ff8c9817..d403ad55 100644 --- a/drivers/gpu/nvgpu/os/posix/os_posix.h +++ b/drivers/gpu/nvgpu/os/posix/os_posix.h | |||
@@ -23,7 +23,7 @@ | |||
23 | #ifndef __NVGPU_OS_POSIX_H__ | 23 | #ifndef __NVGPU_OS_POSIX_H__ |
24 | #define __NVGPU_OS_POSIX_H__ | 24 | #define __NVGPU_OS_POSIX_H__ |
25 | 25 | ||
26 | #include "gk20a/gk20a.h" | 26 | #include <nvgpu/gk20a.h> |
27 | 27 | ||
28 | struct nvgpu_posix_io_callbacks; | 28 | struct nvgpu_posix_io_callbacks; |
29 | 29 | ||