diff options
37 files changed, 38 insertions, 40 deletions
diff --git a/drivers/gpu/nvgpu/common/as.c b/drivers/gpu/nvgpu/common/as.c index 3fcc65fa..31cdd0b6 100644 --- a/drivers/gpu/nvgpu/common/as.c +++ b/drivers/gpu/nvgpu/common/as.c | |||
@@ -28,7 +28,6 @@ | |||
28 | #include <nvgpu/vm.h> | 28 | #include <nvgpu/vm.h> |
29 | 29 | ||
30 | #include "gk20a/gk20a.h" | 30 | #include "gk20a/gk20a.h" |
31 | #include "gk20a/platform_gk20a.h" | ||
32 | 31 | ||
33 | /* dumb allocator... */ | 32 | /* dumb allocator... */ |
34 | static int generate_as_share_id(struct gk20a_as *as) | 33 | static int generate_as_share_id(struct gk20a_as *as) |
diff --git a/drivers/gpu/nvgpu/common/linux/clk.c b/drivers/gpu/nvgpu/common/linux/clk.c index 3f768867..a9888590 100644 --- a/drivers/gpu/nvgpu/common/linux/clk.c +++ b/drivers/gpu/nvgpu/common/linux/clk.c | |||
@@ -22,9 +22,9 @@ | |||
22 | 22 | ||
23 | #include "clk.h" | 23 | #include "clk.h" |
24 | #include "os_linux.h" | 24 | #include "os_linux.h" |
25 | #include "platform_gk20a.h" | ||
25 | 26 | ||
26 | #include "gk20a/gk20a.h" | 27 | #include "gk20a/gk20a.h" |
27 | #include "gk20a/platform_gk20a.h" | ||
28 | 28 | ||
29 | static unsigned long nvgpu_linux_clk_get_rate(struct gk20a *g, u32 api_domain) | 29 | static unsigned long nvgpu_linux_clk_get_rate(struct gk20a *g, u32 api_domain) |
30 | { | 30 | { |
diff --git a/drivers/gpu/nvgpu/common/linux/ctxsw_trace.c b/drivers/gpu/nvgpu/common/linux/ctxsw_trace.c index a4a07a4c..8268bf60 100644 --- a/drivers/gpu/nvgpu/common/linux/ctxsw_trace.c +++ b/drivers/gpu/nvgpu/common/linux/ctxsw_trace.c | |||
@@ -23,13 +23,13 @@ | |||
23 | 23 | ||
24 | #include "gk20a/gk20a.h" | 24 | #include "gk20a/gk20a.h" |
25 | #include "gk20a/gr_gk20a.h" | 25 | #include "gk20a/gr_gk20a.h" |
26 | #include "gk20a/platform_gk20a.h" | ||
27 | 26 | ||
28 | #include <nvgpu/kmem.h> | 27 | #include <nvgpu/kmem.h> |
29 | #include <nvgpu/log.h> | 28 | #include <nvgpu/log.h> |
30 | #include <nvgpu/atomic.h> | 29 | #include <nvgpu/atomic.h> |
31 | #include <nvgpu/barrier.h> | 30 | #include <nvgpu/barrier.h> |
32 | 31 | ||
32 | #include "platform_gk20a.h" | ||
33 | #include "os_linux.h" | 33 | #include "os_linux.h" |
34 | #include "ctxsw_trace.h" | 34 | #include "ctxsw_trace.h" |
35 | 35 | ||
diff --git a/drivers/gpu/nvgpu/common/linux/debug.c b/drivers/gpu/nvgpu/common/linux/debug.c index 08d0e679..7a4e4e9f 100644 --- a/drivers/gpu/nvgpu/common/linux/debug.c +++ b/drivers/gpu/nvgpu/common/linux/debug.c | |||
@@ -24,9 +24,9 @@ | |||
24 | #include "debug_hal.h" | 24 | #include "debug_hal.h" |
25 | #include "debug_xve.h" | 25 | #include "debug_xve.h" |
26 | #include "os_linux.h" | 26 | #include "os_linux.h" |
27 | #include "platform_gk20a.h" | ||
27 | 28 | ||
28 | #include "gk20a/gk20a.h" | 29 | #include "gk20a/gk20a.h" |
29 | #include "gk20a/platform_gk20a.h" | ||
30 | 30 | ||
31 | #include <linux/debugfs.h> | 31 | #include <linux/debugfs.h> |
32 | #include <linux/seq_file.h> | 32 | #include <linux/seq_file.h> |
diff --git a/drivers/gpu/nvgpu/common/linux/debug_cde.c b/drivers/gpu/nvgpu/common/linux/debug_cde.c index cbea83b9..f0afa6ee 100644 --- a/drivers/gpu/nvgpu/common/linux/debug_cde.c +++ b/drivers/gpu/nvgpu/common/linux/debug_cde.c | |||
@@ -13,7 +13,7 @@ | |||
13 | */ | 13 | */ |
14 | 14 | ||
15 | #include "debug_cde.h" | 15 | #include "debug_cde.h" |
16 | #include "gk20a/platform_gk20a.h" | 16 | #include "platform_gk20a.h" |
17 | #include "os_linux.h" | 17 | #include "os_linux.h" |
18 | 18 | ||
19 | #include <linux/debugfs.h> | 19 | #include <linux/debugfs.h> |
diff --git a/drivers/gpu/nvgpu/common/linux/debug_clk.c b/drivers/gpu/nvgpu/common/linux/debug_clk.c index 81839de7..2484d44b 100644 --- a/drivers/gpu/nvgpu/common/linux/debug_clk.c +++ b/drivers/gpu/nvgpu/common/linux/debug_clk.c | |||
@@ -16,9 +16,9 @@ | |||
16 | #include <linux/debugfs.h> | 16 | #include <linux/debugfs.h> |
17 | #include <linux/seq_file.h> | 17 | #include <linux/seq_file.h> |
18 | 18 | ||
19 | #include "gk20a/platform_gk20a.h" | ||
20 | #include "gm20b/clk_gm20b.h" | 19 | #include "gm20b/clk_gm20b.h" |
21 | #include "os_linux.h" | 20 | #include "os_linux.h" |
21 | #include "platform_gk20a.h" | ||
22 | 22 | ||
23 | static int rate_get(void *data, u64 *val) | 23 | static int rate_get(void *data, u64 *val) |
24 | { | 24 | { |
diff --git a/drivers/gpu/nvgpu/common/linux/dma.c b/drivers/gpu/nvgpu/common/linux/dma.c index 9e9d1007..5bac42e3 100644 --- a/drivers/gpu/nvgpu/common/linux/dma.c +++ b/drivers/gpu/nvgpu/common/linux/dma.c | |||
@@ -31,8 +31,8 @@ | |||
31 | #include <nvgpu/linux/vidmem.h> | 31 | #include <nvgpu/linux/vidmem.h> |
32 | 32 | ||
33 | #include "gk20a/gk20a.h" | 33 | #include "gk20a/gk20a.h" |
34 | #include "gk20a/platform_gk20a.h" | ||
35 | 34 | ||
35 | #include "platform_gk20a.h" | ||
36 | #include "os_linux.h" | 36 | #include "os_linux.h" |
37 | 37 | ||
38 | /* | 38 | /* |
diff --git a/drivers/gpu/nvgpu/common/linux/dmabuf.c b/drivers/gpu/nvgpu/common/linux/dmabuf.c index 2415b7c2..6b44ff55 100644 --- a/drivers/gpu/nvgpu/common/linux/dmabuf.c +++ b/drivers/gpu/nvgpu/common/linux/dmabuf.c | |||
@@ -25,8 +25,8 @@ | |||
25 | #include <nvgpu/linux/vidmem.h> | 25 | #include <nvgpu/linux/vidmem.h> |
26 | 26 | ||
27 | #include "gk20a/gk20a.h" | 27 | #include "gk20a/gk20a.h" |
28 | #include "gk20a/platform_gk20a.h" | ||
29 | 28 | ||
29 | #include "platform_gk20a.h" | ||
30 | #include "dmabuf.h" | 30 | #include "dmabuf.h" |
31 | #include "os_linux.h" | 31 | #include "os_linux.h" |
32 | 32 | ||
diff --git a/drivers/gpu/nvgpu/common/linux/driver_common.c b/drivers/gpu/nvgpu/common/linux/driver_common.c index 759607a2..cdb28eaf 100644 --- a/drivers/gpu/nvgpu/common/linux/driver_common.c +++ b/drivers/gpu/nvgpu/common/linux/driver_common.c | |||
@@ -25,7 +25,7 @@ | |||
25 | 25 | ||
26 | #include "scale.h" | 26 | #include "scale.h" |
27 | #include "gk20a/gk20a.h" | 27 | #include "gk20a/gk20a.h" |
28 | #include "gk20a/platform_gk20a.h" | 28 | #include "platform_gk20a.h" |
29 | #include "module.h" | 29 | #include "module.h" |
30 | #include "os_linux.h" | 30 | #include "os_linux.h" |
31 | #include "sysfs.h" | 31 | #include "sysfs.h" |
diff --git a/drivers/gpu/nvgpu/common/linux/firmware.c b/drivers/gpu/nvgpu/common/linux/firmware.c index 44ff1507..a76165ff 100644 --- a/drivers/gpu/nvgpu/common/linux/firmware.c +++ b/drivers/gpu/nvgpu/common/linux/firmware.c | |||
@@ -21,7 +21,7 @@ | |||
21 | #include <nvgpu/firmware.h> | 21 | #include <nvgpu/firmware.h> |
22 | 22 | ||
23 | #include "gk20a/gk20a.h" | 23 | #include "gk20a/gk20a.h" |
24 | #include "gk20a/platform_gk20a.h" | 24 | #include "platform_gk20a.h" |
25 | #include "os_linux.h" | 25 | #include "os_linux.h" |
26 | 26 | ||
27 | static const struct firmware *do_request_firmware(struct device *dev, | 27 | static const struct firmware *do_request_firmware(struct device *dev, |
diff --git a/drivers/gpu/nvgpu/common/linux/ioctl.c b/drivers/gpu/nvgpu/common/linux/ioctl.c index c1053268..0aa7f6a3 100644 --- a/drivers/gpu/nvgpu/common/linux/ioctl.c +++ b/drivers/gpu/nvgpu/common/linux/ioctl.c | |||
@@ -22,7 +22,6 @@ | |||
22 | #include <nvgpu/ctxsw_trace.h> | 22 | #include <nvgpu/ctxsw_trace.h> |
23 | 23 | ||
24 | #include "gk20a/gk20a.h" | 24 | #include "gk20a/gk20a.h" |
25 | #include "gk20a/platform_gk20a.h" | ||
26 | #include "gk20a/dbg_gpu_gk20a.h" | 25 | #include "gk20a/dbg_gpu_gk20a.h" |
27 | 26 | ||
28 | #include "ioctl_channel.h" | 27 | #include "ioctl_channel.h" |
@@ -33,6 +32,7 @@ | |||
33 | #include "module.h" | 32 | #include "module.h" |
34 | #include "os_linux.h" | 33 | #include "os_linux.h" |
35 | #include "ctxsw_trace.h" | 34 | #include "ctxsw_trace.h" |
35 | #include "platform_gk20a.h" | ||
36 | 36 | ||
37 | #define GK20A_NUM_CDEVS 7 | 37 | #define GK20A_NUM_CDEVS 7 |
38 | 38 | ||
diff --git a/drivers/gpu/nvgpu/common/linux/ioctl_as.c b/drivers/gpu/nvgpu/common/linux/ioctl_as.c index 18d0dd07..e566bfb4 100644 --- a/drivers/gpu/nvgpu/common/linux/ioctl_as.c +++ b/drivers/gpu/nvgpu/common/linux/ioctl_as.c | |||
@@ -28,7 +28,7 @@ | |||
28 | #include <nvgpu/linux/vm.h> | 28 | #include <nvgpu/linux/vm.h> |
29 | 29 | ||
30 | #include "gk20a/gk20a.h" | 30 | #include "gk20a/gk20a.h" |
31 | #include "gk20a/platform_gk20a.h" | 31 | #include "platform_gk20a.h" |
32 | #include "ioctl_as.h" | 32 | #include "ioctl_as.h" |
33 | #include "os_linux.h" | 33 | #include "os_linux.h" |
34 | 34 | ||
diff --git a/drivers/gpu/nvgpu/common/linux/ioctl_channel.c b/drivers/gpu/nvgpu/common/linux/ioctl_channel.c index 5b0c4a50..44f662cb 100644 --- a/drivers/gpu/nvgpu/common/linux/ioctl_channel.c +++ b/drivers/gpu/nvgpu/common/linux/ioctl_channel.c | |||
@@ -33,8 +33,8 @@ | |||
33 | #include "gk20a/gk20a.h" | 33 | #include "gk20a/gk20a.h" |
34 | #include "gk20a/dbg_gpu_gk20a.h" | 34 | #include "gk20a/dbg_gpu_gk20a.h" |
35 | #include "gk20a/fence_gk20a.h" | 35 | #include "gk20a/fence_gk20a.h" |
36 | #include "gk20a/platform_gk20a.h" | ||
37 | 36 | ||
37 | #include "platform_gk20a.h" | ||
38 | #include "ioctl_channel.h" | 38 | #include "ioctl_channel.h" |
39 | #include "channel.h" | 39 | #include "channel.h" |
40 | #include "os_linux.h" | 40 | #include "os_linux.h" |
diff --git a/drivers/gpu/nvgpu/common/linux/ioctl_ctrl.c b/drivers/gpu/nvgpu/common/linux/ioctl_ctrl.c index 1442c19a..73911717 100644 --- a/drivers/gpu/nvgpu/common/linux/ioctl_ctrl.c +++ b/drivers/gpu/nvgpu/common/linux/ioctl_ctrl.c | |||
@@ -39,9 +39,9 @@ | |||
39 | #include "ioctl_tsg.h" | 39 | #include "ioctl_tsg.h" |
40 | #include "ioctl_channel.h" | 40 | #include "ioctl_channel.h" |
41 | #include "gk20a/gk20a.h" | 41 | #include "gk20a/gk20a.h" |
42 | #include "gk20a/platform_gk20a.h" | ||
43 | #include "gk20a/fence_gk20a.h" | 42 | #include "gk20a/fence_gk20a.h" |
44 | 43 | ||
44 | #include "platform_gk20a.h" | ||
45 | #include "os_linux.h" | 45 | #include "os_linux.h" |
46 | #include "dmabuf.h" | 46 | #include "dmabuf.h" |
47 | 47 | ||
diff --git a/drivers/gpu/nvgpu/common/linux/ioctl_dbg.c b/drivers/gpu/nvgpu/common/linux/ioctl_dbg.c index 24bf813a..f8bdd19b 100644 --- a/drivers/gpu/nvgpu/common/linux/ioctl_dbg.c +++ b/drivers/gpu/nvgpu/common/linux/ioctl_dbg.c | |||
@@ -33,11 +33,11 @@ | |||
33 | #include <nvgpu/linux/vm.h> | 33 | #include <nvgpu/linux/vm.h> |
34 | 34 | ||
35 | #include "gk20a/gk20a.h" | 35 | #include "gk20a/gk20a.h" |
36 | #include "gk20a/platform_gk20a.h" | ||
37 | #include "gk20a/gr_gk20a.h" | 36 | #include "gk20a/gr_gk20a.h" |
38 | #include "gk20a/regops_gk20a.h" | 37 | #include "gk20a/regops_gk20a.h" |
39 | #include "gk20a/dbg_gpu_gk20a.h" | 38 | #include "gk20a/dbg_gpu_gk20a.h" |
40 | #include "os_linux.h" | 39 | #include "os_linux.h" |
40 | #include "platform_gk20a.h" | ||
41 | #include "ioctl_dbg.h" | 41 | #include "ioctl_dbg.h" |
42 | 42 | ||
43 | 43 | ||
diff --git a/drivers/gpu/nvgpu/common/linux/ioctl_tsg.c b/drivers/gpu/nvgpu/common/linux/ioctl_tsg.c index 7eea636e..2570886d 100644 --- a/drivers/gpu/nvgpu/common/linux/ioctl_tsg.c +++ b/drivers/gpu/nvgpu/common/linux/ioctl_tsg.c | |||
@@ -25,8 +25,8 @@ | |||
25 | #include <nvgpu/log.h> | 25 | #include <nvgpu/log.h> |
26 | 26 | ||
27 | #include "gk20a/gk20a.h" | 27 | #include "gk20a/gk20a.h" |
28 | #include "gk20a/platform_gk20a.h" | ||
29 | #include "gk20a/tsg_gk20a.h" | 28 | #include "gk20a/tsg_gk20a.h" |
29 | #include "platform_gk20a.h" | ||
30 | #include "ioctl_tsg.h" | 30 | #include "ioctl_tsg.h" |
31 | #include "ioctl_channel.h" | 31 | #include "ioctl_channel.h" |
32 | #include "os_linux.h" | 32 | #include "os_linux.h" |
diff --git a/drivers/gpu/nvgpu/common/linux/log.c b/drivers/gpu/nvgpu/common/linux/log.c index f371bb77..e120a3de 100644 --- a/drivers/gpu/nvgpu/common/linux/log.c +++ b/drivers/gpu/nvgpu/common/linux/log.c | |||
@@ -20,7 +20,7 @@ | |||
20 | #include <nvgpu/log.h> | 20 | #include <nvgpu/log.h> |
21 | 21 | ||
22 | #include "gk20a/gk20a.h" | 22 | #include "gk20a/gk20a.h" |
23 | #include "gk20a/platform_gk20a.h" | 23 | #include "platform_gk20a.h" |
24 | #include "os_linux.h" | 24 | #include "os_linux.h" |
25 | 25 | ||
26 | /* | 26 | /* |
diff --git a/drivers/gpu/nvgpu/common/linux/module.c b/drivers/gpu/nvgpu/common/linux/module.c index 7706d826..4aff6a2d 100644 --- a/drivers/gpu/nvgpu/common/linux/module.c +++ b/drivers/gpu/nvgpu/common/linux/module.c | |||
@@ -33,7 +33,7 @@ | |||
33 | #include <nvgpu/debug.h> | 33 | #include <nvgpu/debug.h> |
34 | #include <nvgpu/ctxsw_trace.h> | 34 | #include <nvgpu/ctxsw_trace.h> |
35 | 35 | ||
36 | #include "gk20a/platform_gk20a.h" | 36 | #include "platform_gk20a.h" |
37 | #include "sysfs.h" | 37 | #include "sysfs.h" |
38 | #include "vgpu/vgpu.h" | 38 | #include "vgpu/vgpu.h" |
39 | #include "scale.h" | 39 | #include "scale.h" |
@@ -661,7 +661,7 @@ static int gk20a_init_support(struct platform_device *dev) | |||
661 | goto fail; | 661 | goto fail; |
662 | } | 662 | } |
663 | 663 | ||
664 | err = gk20a_init_sim_support(dev); | 664 | err = gk20a_init_sim_support(g); |
665 | if (err) | 665 | if (err) |
666 | goto fail; | 666 | goto fail; |
667 | } | 667 | } |
diff --git a/drivers/gpu/nvgpu/common/linux/pci.c b/drivers/gpu/nvgpu/common/linux/pci.c index 19483f86..118567e5 100644 --- a/drivers/gpu/nvgpu/common/linux/pci.c +++ b/drivers/gpu/nvgpu/common/linux/pci.c | |||
@@ -23,13 +23,13 @@ | |||
23 | #include <nvgpu/enabled.h> | 23 | #include <nvgpu/enabled.h> |
24 | 24 | ||
25 | #include "gk20a/gk20a.h" | 25 | #include "gk20a/gk20a.h" |
26 | #include "gk20a/platform_gk20a.h" | ||
27 | #include "clk/clk.h" | 26 | #include "clk/clk.h" |
28 | #include "clk/clk_mclk.h" | 27 | #include "clk/clk_mclk.h" |
29 | #include "module.h" | 28 | #include "module.h" |
30 | #include "intr.h" | 29 | #include "intr.h" |
31 | #include "sysfs.h" | 30 | #include "sysfs.h" |
32 | #include "os_linux.h" | 31 | #include "os_linux.h" |
32 | #include "platform_gk20a.h" | ||
33 | 33 | ||
34 | #include "pci.h" | 34 | #include "pci.h" |
35 | #ifdef CONFIG_TEGRA_19x_GPU | 35 | #ifdef CONFIG_TEGRA_19x_GPU |
diff --git a/drivers/gpu/nvgpu/gk20a/platform_gk20a.h b/drivers/gpu/nvgpu/common/linux/platform_gk20a.h index d4ff17f3..348c9e24 100644 --- a/drivers/gpu/nvgpu/gk20a/platform_gk20a.h +++ b/drivers/gpu/nvgpu/common/linux/platform_gk20a.h | |||
@@ -29,7 +29,7 @@ | |||
29 | 29 | ||
30 | #include <nvgpu/lock.h> | 30 | #include <nvgpu/lock.h> |
31 | 31 | ||
32 | #include "gk20a.h" | 32 | #include "gk20a/gk20a.h" |
33 | 33 | ||
34 | #define GK20A_CLKS_MAX 4 | 34 | #define GK20A_CLKS_MAX 4 |
35 | 35 | ||
diff --git a/drivers/gpu/nvgpu/common/linux/platform_gk20a_tegra.c b/drivers/gpu/nvgpu/common/linux/platform_gk20a_tegra.c index 2d6d156c..c40eafe4 100644 --- a/drivers/gpu/nvgpu/common/linux/platform_gk20a_tegra.c +++ b/drivers/gpu/nvgpu/common/linux/platform_gk20a_tegra.c | |||
@@ -47,10 +47,10 @@ | |||
47 | #include <nvgpu/linux/dma.h> | 47 | #include <nvgpu/linux/dma.h> |
48 | 48 | ||
49 | #include "gk20a/gk20a.h" | 49 | #include "gk20a/gk20a.h" |
50 | #include "gk20a/platform_gk20a.h" | ||
51 | #include "gm20b/clk_gm20b.h" | 50 | #include "gm20b/clk_gm20b.h" |
52 | 51 | ||
53 | #include "scale.h" | 52 | #include "scale.h" |
53 | #include "platform_gk20a.h" | ||
54 | #include "clk.h" | 54 | #include "clk.h" |
55 | #include "os_linux.h" | 55 | #include "os_linux.h" |
56 | 56 | ||
diff --git a/drivers/gpu/nvgpu/common/linux/platform_gp10b_tegra.c b/drivers/gpu/nvgpu/common/linux/platform_gp10b_tegra.c index 1f7a7694..b944844e 100644 --- a/drivers/gpu/nvgpu/common/linux/platform_gp10b_tegra.c +++ b/drivers/gpu/nvgpu/common/linux/platform_gp10b_tegra.c | |||
@@ -35,9 +35,9 @@ | |||
35 | 35 | ||
36 | #include "clk.h" | 36 | #include "clk.h" |
37 | 37 | ||
38 | #include "gk20a/platform_gk20a.h" | ||
39 | #include "gk20a/gk20a.h" | 38 | #include "gk20a/gk20a.h" |
40 | 39 | ||
40 | #include "platform_gk20a.h" | ||
41 | #include "platform_gk20a_tegra.h" | 41 | #include "platform_gk20a_tegra.h" |
42 | #include "gp10b/platform_gp10b.h" | 42 | #include "gp10b/platform_gp10b.h" |
43 | #include "platform_gp10b_tegra.h" | 43 | #include "platform_gp10b_tegra.h" |
diff --git a/drivers/gpu/nvgpu/common/linux/scale.c b/drivers/gpu/nvgpu/common/linux/scale.c index 05f09dcc..84ac1cfd 100644 --- a/drivers/gpu/nvgpu/common/linux/scale.c +++ b/drivers/gpu/nvgpu/common/linux/scale.c | |||
@@ -27,7 +27,7 @@ | |||
27 | #include <nvgpu/log.h> | 27 | #include <nvgpu/log.h> |
28 | 28 | ||
29 | #include "gk20a/gk20a.h" | 29 | #include "gk20a/gk20a.h" |
30 | #include "gk20a/platform_gk20a.h" | 30 | #include "platform_gk20a.h" |
31 | #include "scale.h" | 31 | #include "scale.h" |
32 | #include "os_linux.h" | 32 | #include "os_linux.h" |
33 | 33 | ||
diff --git a/drivers/gpu/nvgpu/common/linux/sysfs.c b/drivers/gpu/nvgpu/common/linux/sysfs.c index 6897fae8..b1e7d1ed 100644 --- a/drivers/gpu/nvgpu/common/linux/sysfs.c +++ b/drivers/gpu/nvgpu/common/linux/sysfs.c | |||
@@ -23,7 +23,7 @@ | |||
23 | #include <nvgpu/nvhost.h> | 23 | #include <nvgpu/nvhost.h> |
24 | 24 | ||
25 | #include "sysfs.h" | 25 | #include "sysfs.h" |
26 | #include "gk20a/platform_gk20a.h" | 26 | #include "platform_gk20a.h" |
27 | #include "gk20a/pmu_gk20a.h" | 27 | #include "gk20a/pmu_gk20a.h" |
28 | #include "gk20a/gr_gk20a.h" | 28 | #include "gk20a/gr_gk20a.h" |
29 | 29 | ||
diff --git a/drivers/gpu/nvgpu/common/linux/timers.c b/drivers/gpu/nvgpu/common/linux/timers.c index 5786b240..d0004aa5 100644 --- a/drivers/gpu/nvgpu/common/linux/timers.c +++ b/drivers/gpu/nvgpu/common/linux/timers.c | |||
@@ -21,7 +21,8 @@ | |||
21 | #include <nvgpu/soc.h> | 21 | #include <nvgpu/soc.h> |
22 | 22 | ||
23 | #include "gk20a/gk20a.h" | 23 | #include "gk20a/gk20a.h" |
24 | #include "gk20a/platform_gk20a.h" | 24 | |
25 | #include "platform_gk20a.h" | ||
25 | 26 | ||
26 | /* | 27 | /* |
27 | * Returns 1 if the platform is pre-Si and should ignore the timeout checking. | 28 | * Returns 1 if the platform is pre-Si and should ignore the timeout checking. |
diff --git a/drivers/gpu/nvgpu/common/linux/vm.c b/drivers/gpu/nvgpu/common/linux/vm.c index bb337d97..d04ed5ed 100644 --- a/drivers/gpu/nvgpu/common/linux/vm.c +++ b/drivers/gpu/nvgpu/common/linux/vm.c | |||
@@ -32,8 +32,8 @@ | |||
32 | #include "gk20a/gk20a.h" | 32 | #include "gk20a/gk20a.h" |
33 | #include "gk20a/mm_gk20a.h" | 33 | #include "gk20a/mm_gk20a.h" |
34 | #include "gk20a/kind_gk20a.h" | 34 | #include "gk20a/kind_gk20a.h" |
35 | #include "gk20a/platform_gk20a.h" | ||
36 | 35 | ||
36 | #include "platform_gk20a.h" | ||
37 | #include "os_linux.h" | 37 | #include "os_linux.h" |
38 | #include "dmabuf.h" | 38 | #include "dmabuf.h" |
39 | 39 | ||
diff --git a/drivers/gpu/nvgpu/gk20a/dbg_gpu_gk20a.c b/drivers/gpu/nvgpu/gk20a/dbg_gpu_gk20a.c index 802ccd76..f70cfdf8 100644 --- a/drivers/gpu/nvgpu/gk20a/dbg_gpu_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/dbg_gpu_gk20a.c | |||
@@ -29,7 +29,6 @@ | |||
29 | #include <nvgpu/mm.h> | 29 | #include <nvgpu/mm.h> |
30 | 30 | ||
31 | #include "gk20a.h" | 31 | #include "gk20a.h" |
32 | #include "gk20a/platform_gk20a.h" | ||
33 | #include "gr_gk20a.h" | 32 | #include "gr_gk20a.h" |
34 | #include "dbg_gpu_gk20a.h" | 33 | #include "dbg_gpu_gk20a.h" |
35 | #include "regops_gk20a.h" | 34 | #include "regops_gk20a.h" |
diff --git a/drivers/gpu/nvgpu/gk20a/mm_gk20a.c b/drivers/gpu/nvgpu/gk20a/mm_gk20a.c index cb0c015e..d54e8d43 100644 --- a/drivers/gpu/nvgpu/gk20a/mm_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/mm_gk20a.c | |||
@@ -41,7 +41,6 @@ | |||
41 | #include <nvgpu/vidmem.h> | 41 | #include <nvgpu/vidmem.h> |
42 | 42 | ||
43 | #include "gk20a.h" | 43 | #include "gk20a.h" |
44 | #include "platform_gk20a.h" | ||
45 | #include "mm_gk20a.h" | 44 | #include "mm_gk20a.h" |
46 | #include "fence_gk20a.h" | 45 | #include "fence_gk20a.h" |
47 | #include "kind_gk20a.h" | 46 | #include "kind_gk20a.h" |
diff --git a/drivers/gpu/nvgpu/gk20a/platform_vgpu_tegra.c b/drivers/gpu/nvgpu/gk20a/platform_vgpu_tegra.c index 90a37c47..6209188c 100644 --- a/drivers/gpu/nvgpu/gk20a/platform_vgpu_tegra.c +++ b/drivers/gpu/nvgpu/gk20a/platform_vgpu_tegra.c | |||
@@ -23,7 +23,7 @@ | |||
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include "gk20a.h" | 25 | #include "gk20a.h" |
26 | #include "platform_gk20a.h" | 26 | #include "common/linux/platform_gk20a.h" |
27 | #include "vgpu/clk_vgpu.h" | 27 | #include "vgpu/clk_vgpu.h" |
28 | 28 | ||
29 | #include <nvgpu/nvhost.h> | 29 | #include <nvgpu/nvhost.h> |
diff --git a/drivers/gpu/nvgpu/gk20a/sim_gk20a.c b/drivers/gpu/nvgpu/gk20a/sim_gk20a.c index 34ca5add..ab064710 100644 --- a/drivers/gpu/nvgpu/gk20a/sim_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/sim_gk20a.c | |||
@@ -28,7 +28,6 @@ | |||
28 | #include <nvgpu/linux/vm.h> | 28 | #include <nvgpu/linux/vm.h> |
29 | 29 | ||
30 | #include "gk20a.h" | 30 | #include "gk20a.h" |
31 | #include "platform_gk20a.h" | ||
32 | 31 | ||
33 | #include <nvgpu/hw/gk20a/hw_sim_gk20a.h> | 32 | #include <nvgpu/hw/gk20a/hw_sim_gk20a.h> |
34 | 33 | ||
@@ -104,11 +103,9 @@ static int alloc_and_kmap_iopage(struct gk20a *g, | |||
104 | 103 | ||
105 | } | 104 | } |
106 | 105 | ||
107 | int gk20a_init_sim_support(struct platform_device *pdev) | 106 | int gk20a_init_sim_support(struct gk20a *g) |
108 | { | 107 | { |
109 | int err = 0; | 108 | int err = 0; |
110 | struct device *dev = &pdev->dev; | ||
111 | struct gk20a *g = get_gk20a(dev); | ||
112 | u64 phys; | 109 | u64 phys; |
113 | 110 | ||
114 | /* allocate sim event/msg buffers */ | 111 | /* allocate sim event/msg buffers */ |
diff --git a/drivers/gpu/nvgpu/gk20a/sim_gk20a.h b/drivers/gpu/nvgpu/gk20a/sim_gk20a.h index 17e508de..44378e7a 100644 --- a/drivers/gpu/nvgpu/gk20a/sim_gk20a.h +++ b/drivers/gpu/nvgpu/gk20a/sim_gk20a.h | |||
@@ -45,7 +45,7 @@ struct sim_gk20a { | |||
45 | void (*remove_support)(struct sim_gk20a *); | 45 | void (*remove_support)(struct sim_gk20a *); |
46 | }; | 46 | }; |
47 | 47 | ||
48 | int gk20a_init_sim_support(struct platform_device *pdev); | 48 | int gk20a_init_sim_support(struct gk20a *g); |
49 | int gk20a_sim_esc_readl(struct gk20a *g, char *path, u32 index, u32 *data); | 49 | int gk20a_sim_esc_readl(struct gk20a *g, char *path, u32 index, u32 *data); |
50 | 50 | ||
51 | #endif /*__SIM_GK20A_H__*/ | 51 | #endif /*__SIM_GK20A_H__*/ |
diff --git a/drivers/gpu/nvgpu/gm20b/clk_gm20b.h b/drivers/gpu/nvgpu/gm20b/clk_gm20b.h index daa0bb0b..e814ac70 100644 --- a/drivers/gpu/nvgpu/gm20b/clk_gm20b.h +++ b/drivers/gpu/nvgpu/gm20b/clk_gm20b.h | |||
@@ -26,6 +26,9 @@ | |||
26 | 26 | ||
27 | #include <nvgpu/lock.h> | 27 | #include <nvgpu/lock.h> |
28 | 28 | ||
29 | struct gk20a; | ||
30 | struct clk_gk20a; | ||
31 | |||
29 | struct nvgpu_clk_pll_debug_data { | 32 | struct nvgpu_clk_pll_debug_data { |
30 | u32 trim_sys_sel_vco_reg; | 33 | u32 trim_sys_sel_vco_reg; |
31 | u32 trim_sys_sel_vco_val; | 34 | u32 trim_sys_sel_vco_val; |
diff --git a/drivers/gpu/nvgpu/pmgr/pmgrpmu.c b/drivers/gpu/nvgpu/pmgr/pmgrpmu.c index afc92d66..6913c280 100644 --- a/drivers/gpu/nvgpu/pmgr/pmgrpmu.c +++ b/drivers/gpu/nvgpu/pmgr/pmgrpmu.c | |||
@@ -25,9 +25,9 @@ | |||
25 | #include <nvgpu/pmu.h> | 25 | #include <nvgpu/pmu.h> |
26 | 26 | ||
27 | #include "gk20a/gk20a.h" | 27 | #include "gk20a/gk20a.h" |
28 | #include "gk20a/platform_gk20a.h" | ||
29 | #include "gp106/bios_gp106.h" | 28 | #include "gp106/bios_gp106.h" |
30 | #include "common/linux/os_linux.h" | 29 | #include "common/linux/os_linux.h" |
30 | #include "common/linux/platform_gk20a.h" | ||
31 | 31 | ||
32 | #include "boardobj/boardobjgrp.h" | 32 | #include "boardobj/boardobjgrp.h" |
33 | #include "boardobj/boardobjgrp_e32.h" | 33 | #include "boardobj/boardobjgrp_e32.h" |
diff --git a/drivers/gpu/nvgpu/pmgr/pwrpolicy.c b/drivers/gpu/nvgpu/pmgr/pwrpolicy.c index 37fff2d4..5eade2e0 100644 --- a/drivers/gpu/nvgpu/pmgr/pwrpolicy.c +++ b/drivers/gpu/nvgpu/pmgr/pwrpolicy.c | |||
@@ -24,12 +24,12 @@ | |||
24 | #include <nvgpu/bug.h> | 24 | #include <nvgpu/bug.h> |
25 | 25 | ||
26 | #include "gk20a/gk20a.h" | 26 | #include "gk20a/gk20a.h" |
27 | #include "gk20a/platform_gk20a.h" | ||
28 | #include "pwrpolicy.h" | 27 | #include "pwrpolicy.h" |
29 | #include "boardobj/boardobjgrp.h" | 28 | #include "boardobj/boardobjgrp.h" |
30 | #include "boardobj/boardobjgrp_e32.h" | 29 | #include "boardobj/boardobjgrp_e32.h" |
31 | #include "gp106/bios_gp106.h" | 30 | #include "gp106/bios_gp106.h" |
32 | #include "common/linux/os_linux.h" | 31 | #include "common/linux/os_linux.h" |
32 | #include "common/linux/platform_gk20a.h" | ||
33 | 33 | ||
34 | #define _pwr_policy_limitarboutputget_helper(p_limit_arb) (p_limit_arb)->output | 34 | #define _pwr_policy_limitarboutputget_helper(p_limit_arb) (p_limit_arb)->output |
35 | #define _pwr_policy_limitdeltaapply(limit, delta) ((u32)max(((s32)limit) + (delta), 0)) | 35 | #define _pwr_policy_limitdeltaapply(limit, delta) ((u32)max(((s32)limit) + (delta), 0)) |
diff --git a/drivers/gpu/nvgpu/vgpu/css_vgpu.c b/drivers/gpu/nvgpu/vgpu/css_vgpu.c index 266ce871..f45ccc60 100644 --- a/drivers/gpu/nvgpu/vgpu/css_vgpu.c +++ b/drivers/gpu/nvgpu/vgpu/css_vgpu.c | |||
@@ -26,8 +26,8 @@ | |||
26 | 26 | ||
27 | #include "gk20a/gk20a.h" | 27 | #include "gk20a/gk20a.h" |
28 | #include "gk20a/channel_gk20a.h" | 28 | #include "gk20a/channel_gk20a.h" |
29 | #include "gk20a/platform_gk20a.h" | ||
30 | #include "gk20a/css_gr_gk20a.h" | 29 | #include "gk20a/css_gr_gk20a.h" |
30 | #include "common/linux/platform_gk20a.h" | ||
31 | #include "vgpu.h" | 31 | #include "vgpu.h" |
32 | #include "css_vgpu.h" | 32 | #include "css_vgpu.h" |
33 | 33 | ||
diff --git a/drivers/gpu/nvgpu/vgpu/tsg_vgpu.c b/drivers/gpu/nvgpu/vgpu/tsg_vgpu.c index 94d7140e..683317dc 100644 --- a/drivers/gpu/nvgpu/vgpu/tsg_vgpu.c +++ b/drivers/gpu/nvgpu/vgpu/tsg_vgpu.c | |||
@@ -24,8 +24,8 @@ | |||
24 | 24 | ||
25 | #include "gk20a/gk20a.h" | 25 | #include "gk20a/gk20a.h" |
26 | #include "gk20a/channel_gk20a.h" | 26 | #include "gk20a/channel_gk20a.h" |
27 | #include "gk20a/platform_gk20a.h" | ||
28 | #include "gk20a/tsg_gk20a.h" | 27 | #include "gk20a/tsg_gk20a.h" |
28 | #include "common/linux/platform_gk20a.h" | ||
29 | #include "vgpu.h" | 29 | #include "vgpu.h" |
30 | #include "fifo_vgpu.h" | 30 | #include "fifo_vgpu.h" |
31 | 31 | ||
diff --git a/drivers/gpu/nvgpu/vgpu/vgpu.h b/drivers/gpu/nvgpu/vgpu/vgpu.h index d5c49c0f..6ce61e92 100644 --- a/drivers/gpu/nvgpu/vgpu/vgpu.h +++ b/drivers/gpu/nvgpu/vgpu/vgpu.h | |||
@@ -28,7 +28,7 @@ | |||
28 | #include <linux/tegra_gr_comm.h> | 28 | #include <linux/tegra_gr_comm.h> |
29 | #include <linux/tegra_vgpu.h> | 29 | #include <linux/tegra_vgpu.h> |
30 | #include "gk20a/gk20a.h" | 30 | #include "gk20a/gk20a.h" |
31 | #include "gk20a/platform_gk20a.h" | 31 | #include "common/linux/platform_gk20a.h" |
32 | #include "common/linux/os_linux.h" | 32 | #include "common/linux/os_linux.h" |
33 | 33 | ||
34 | #include <nvgpu/thread.h> | 34 | #include <nvgpu/thread.h> |