diff options
25 files changed, 36 insertions, 32 deletions
diff --git a/drivers/gpu/nvgpu/gp106/acr_gp106.c b/drivers/gpu/nvgpu/gp106/acr_gp106.c index b1150e29..2a4ee6d5 100644 --- a/drivers/gpu/nvgpu/gp106/acr_gp106.c +++ b/drivers/gpu/nvgpu/gp106/acr_gp106.c | |||
@@ -29,8 +29,7 @@ | |||
29 | #include <nvgpu/enabled.h> | 29 | #include <nvgpu/enabled.h> |
30 | #include <nvgpu/io.h> | 30 | #include <nvgpu/io.h> |
31 | #include <nvgpu/utils.h> | 31 | #include <nvgpu/utils.h> |
32 | 32 | #include <nvgpu/gk20a.h> | |
33 | #include "gk20a/gk20a.h" | ||
34 | 33 | ||
35 | #include "gm20b/mm_gm20b.h" | 34 | #include "gm20b/mm_gm20b.h" |
36 | #include "gm20b/acr_gm20b.h" | 35 | #include "gm20b/acr_gm20b.h" |
diff --git a/drivers/gpu/nvgpu/gp106/bios_gp106.c b/drivers/gpu/nvgpu/gp106/bios_gp106.c index 2c212ec0..f0db87ca 100644 --- a/drivers/gpu/nvgpu/gp106/bios_gp106.c +++ b/drivers/gpu/nvgpu/gp106/bios_gp106.c | |||
@@ -27,8 +27,8 @@ | |||
27 | #include <nvgpu/falcon.h> | 27 | #include <nvgpu/falcon.h> |
28 | #include <nvgpu/enabled.h> | 28 | #include <nvgpu/enabled.h> |
29 | #include <nvgpu/io.h> | 29 | #include <nvgpu/io.h> |
30 | #include <nvgpu/gk20a.h> | ||
30 | 31 | ||
31 | #include "gk20a/gk20a.h" | ||
32 | #include "gm20b/fifo_gm20b.h" | 32 | #include "gm20b/fifo_gm20b.h" |
33 | #include "bios_gp106.h" | 33 | #include "bios_gp106.h" |
34 | #include "gp106/mclk_gp106.h" | 34 | #include "gp106/mclk_gp106.h" |
diff --git a/drivers/gpu/nvgpu/gp106/clk_arb_gp106.c b/drivers/gpu/nvgpu/gp106/clk_arb_gp106.c index 87fc6a1f..ce0c03b9 100644 --- a/drivers/gpu/nvgpu/gp106/clk_arb_gp106.c +++ b/drivers/gpu/nvgpu/gp106/clk_arb_gp106.c | |||
@@ -20,7 +20,7 @@ | |||
20 | * DEALINGS IN THE SOFTWARE. | 20 | * DEALINGS IN THE SOFTWARE. |
21 | */ | 21 | */ |
22 | 22 | ||
23 | #include "gk20a/gk20a.h" | 23 | #include <nvgpu/gk20a.h> |
24 | #include <nvgpu/clk_arb.h> | 24 | #include <nvgpu/clk_arb.h> |
25 | 25 | ||
26 | #include "clk_arb_gp106.h" | 26 | #include "clk_arb_gp106.h" |
diff --git a/drivers/gpu/nvgpu/gp106/clk_gp106.c b/drivers/gpu/nvgpu/gp106/clk_gp106.c index e892ceda..28aa999f 100644 --- a/drivers/gpu/nvgpu/gp106/clk_gp106.c +++ b/drivers/gpu/nvgpu/gp106/clk_gp106.c | |||
@@ -28,9 +28,9 @@ | |||
28 | #include <nvgpu/clk_arb.h> | 28 | #include <nvgpu/clk_arb.h> |
29 | #include <nvgpu/timers.h> | 29 | #include <nvgpu/timers.h> |
30 | #include <nvgpu/pmu.h> | 30 | #include <nvgpu/pmu.h> |
31 | #include <nvgpu/gk20a.h> | ||
31 | 32 | ||
32 | #include "clk/clk.h" | 33 | #include "clk/clk.h" |
33 | #include "gk20a/gk20a.h" | ||
34 | #include "gp106/mclk_gp106.h" | 34 | #include "gp106/mclk_gp106.h" |
35 | 35 | ||
36 | #include "clk_gp106.h" | 36 | #include "clk_gp106.h" |
diff --git a/drivers/gpu/nvgpu/gp106/fifo_gp106.c b/drivers/gpu/nvgpu/gp106/fifo_gp106.c index 8202426e..841238a9 100644 --- a/drivers/gpu/nvgpu/gp106/fifo_gp106.c +++ b/drivers/gpu/nvgpu/gp106/fifo_gp106.c | |||
@@ -20,7 +20,9 @@ | |||
20 | * DEALINGS IN THE SOFTWARE. | 20 | * DEALINGS IN THE SOFTWARE. |
21 | */ | 21 | */ |
22 | 22 | ||
23 | #include "gk20a/gk20a.h" | 23 | #include <nvgpu/gk20a.h> |
24 | #include <nvgpu/bug.h> | ||
25 | |||
24 | #include "gp10b/fifo_gp10b.h" | 26 | #include "gp10b/fifo_gp10b.h" |
25 | 27 | ||
26 | #include "fifo_gp106.h" | 28 | #include "fifo_gp106.h" |
@@ -28,8 +30,6 @@ | |||
28 | #include <nvgpu/hw/gp106/hw_ccsr_gp106.h> | 30 | #include <nvgpu/hw/gp106/hw_ccsr_gp106.h> |
29 | #include <nvgpu/hw/gp106/hw_fifo_gp106.h> | 31 | #include <nvgpu/hw/gp106/hw_fifo_gp106.h> |
30 | 32 | ||
31 | #include <nvgpu/bug.h> | ||
32 | |||
33 | u32 gp106_fifo_get_num_fifos(struct gk20a *g) | 33 | u32 gp106_fifo_get_num_fifos(struct gk20a *g) |
34 | { | 34 | { |
35 | return ccsr_channel__size_1_v(); | 35 | return ccsr_channel__size_1_v(); |
diff --git a/drivers/gpu/nvgpu/gp106/flcn_gp106.c b/drivers/gpu/nvgpu/gp106/flcn_gp106.c index 8f649c26..94266d52 100644 --- a/drivers/gpu/nvgpu/gp106/flcn_gp106.c +++ b/drivers/gpu/nvgpu/gp106/flcn_gp106.c | |||
@@ -19,7 +19,8 @@ | |||
19 | * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER | 19 | * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
20 | * DEALINGS IN THE SOFTWARE. | 20 | * DEALINGS IN THE SOFTWARE. |
21 | */ | 21 | */ |
22 | #include "gk20a/gk20a.h" | 22 | #include <nvgpu/gk20a.h> |
23 | |||
23 | #include "gk20a/flcn_gk20a.h" | 24 | #include "gk20a/flcn_gk20a.h" |
24 | #include "gp106/sec2_gp106.h" | 25 | #include "gp106/sec2_gp106.h" |
25 | #include "gp106/flcn_gp106.h" | 26 | #include "gp106/flcn_gp106.h" |
diff --git a/drivers/gpu/nvgpu/gp106/gr_ctx_gp106.c b/drivers/gpu/nvgpu/gp106/gr_ctx_gp106.c index 5dc0f591..ab381239 100644 --- a/drivers/gpu/nvgpu/gp106/gr_ctx_gp106.c +++ b/drivers/gpu/nvgpu/gp106/gr_ctx_gp106.c | |||
@@ -1,7 +1,7 @@ | |||
1 | /* | 1 | /* |
2 | * GP106 Graphics Context | 2 | * GP106 Graphics Context |
3 | * | 3 | * |
4 | * Copyright (c) 2016-2017, NVIDIA CORPORATION. All rights reserved. | 4 | * Copyright (c) 2016-2018, NVIDIA CORPORATION. All rights reserved. |
5 | * | 5 | * |
6 | * Permission is hereby granted, free of charge, to any person obtaining a | 6 | * Permission is hereby granted, free of charge, to any person obtaining a |
7 | * copy of this software and associated documentation files (the "Software"), | 7 | * copy of this software and associated documentation files (the "Software"), |
@@ -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 "gr_ctx_gp106.h" | 27 | #include "gr_ctx_gp106.h" |
27 | 28 | ||
28 | int gr_gp106_get_netlist_name(struct gk20a *g, int index, char *name) | 29 | int gr_gp106_get_netlist_name(struct gk20a *g, int index, char *name) |
diff --git a/drivers/gpu/nvgpu/gp106/gr_gp106.c b/drivers/gpu/nvgpu/gp106/gr_gp106.c index a3fd8912..2de0ae87 100644 --- a/drivers/gpu/nvgpu/gp106/gr_gp106.c +++ b/drivers/gpu/nvgpu/gp106/gr_gp106.c | |||
@@ -23,8 +23,8 @@ | |||
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include <nvgpu/dma.h> | 25 | #include <nvgpu/dma.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 "gm20b/gr_gm20b.h" | 29 | #include "gm20b/gr_gm20b.h" |
30 | #include "gp10b/gr_gp10b.h" | 30 | #include "gp10b/gr_gp10b.h" |
diff --git a/drivers/gpu/nvgpu/gp106/hal_gp106.c b/drivers/gpu/nvgpu/gp106/hal_gp106.c index e8ad68c2..c0f2fd57 100644 --- a/drivers/gpu/nvgpu/gp106/hal_gp106.c +++ b/drivers/gpu/nvgpu/gp106/hal_gp106.c | |||
@@ -43,7 +43,6 @@ | |||
43 | #include "common/mc/mc_gm20b.h" | 43 | #include "common/mc/mc_gm20b.h" |
44 | #include "common/mc/mc_gp10b.h" | 44 | #include "common/mc/mc_gp10b.h" |
45 | 45 | ||
46 | #include "gk20a/gk20a.h" | ||
47 | #include "gk20a/fifo_gk20a.h" | 46 | #include "gk20a/fifo_gk20a.h" |
48 | #include "gk20a/fecs_trace_gk20a.h" | 47 | #include "gk20a/fecs_trace_gk20a.h" |
49 | #include "gk20a/mm_gk20a.h" | 48 | #include "gk20a/mm_gk20a.h" |
@@ -95,6 +94,7 @@ | |||
95 | #include <nvgpu/ctxsw_trace.h> | 94 | #include <nvgpu/ctxsw_trace.h> |
96 | #include <nvgpu/error_notifier.h> | 95 | #include <nvgpu/error_notifier.h> |
97 | #include <nvgpu/clk_arb.h> | 96 | #include <nvgpu/clk_arb.h> |
97 | #include <nvgpu/gk20a.h> | ||
98 | #include <nvgpu/channel.h> | 98 | #include <nvgpu/channel.h> |
99 | 99 | ||
100 | #include <nvgpu/hw/gp106/hw_proj_gp106.h> | 100 | #include <nvgpu/hw/gp106/hw_proj_gp106.h> |
diff --git a/drivers/gpu/nvgpu/gp106/mclk_gp106.c b/drivers/gpu/nvgpu/gp106/mclk_gp106.c index b4f553ec..f2aa7c47 100644 --- a/drivers/gpu/nvgpu/gp106/mclk_gp106.c +++ b/drivers/gpu/nvgpu/gp106/mclk_gp106.c | |||
@@ -26,8 +26,8 @@ | |||
26 | #include <nvgpu/timers.h> | 26 | #include <nvgpu/timers.h> |
27 | #include <nvgpu/io.h> | 27 | #include <nvgpu/io.h> |
28 | #include <nvgpu/utils.h> | 28 | #include <nvgpu/utils.h> |
29 | #include <nvgpu/gk20a.h> | ||
29 | 30 | ||
30 | #include "gk20a/gk20a.h" | ||
31 | #ifdef CONFIG_DEBUG_FS | 31 | #ifdef CONFIG_DEBUG_FS |
32 | #include <linux/debugfs.h> | 32 | #include <linux/debugfs.h> |
33 | #include "os/linux/os_linux.h" | 33 | #include "os/linux/os_linux.h" |
diff --git a/drivers/gpu/nvgpu/gp106/pmu_gp106.c b/drivers/gpu/nvgpu/gp106/pmu_gp106.c index 3e4a7390..a95f05f0 100644 --- a/drivers/gpu/nvgpu/gp106/pmu_gp106.c +++ b/drivers/gpu/nvgpu/gp106/pmu_gp106.c | |||
@@ -24,8 +24,8 @@ | |||
24 | #include <nvgpu/enabled.h> | 24 | #include <nvgpu/enabled.h> |
25 | #include <nvgpu/io.h> | 25 | #include <nvgpu/io.h> |
26 | #include <nvgpu/clk_arb.h> | 26 | #include <nvgpu/clk_arb.h> |
27 | #include <nvgpu/gk20a.h> | ||
27 | 28 | ||
28 | #include "gk20a/gk20a.h" | ||
29 | #include "gk20a/pmu_gk20a.h" | 29 | #include "gk20a/pmu_gk20a.h" |
30 | 30 | ||
31 | #include "gm20b/acr_gm20b.h" | 31 | #include "gm20b/acr_gm20b.h" |
diff --git a/drivers/gpu/nvgpu/gp106/regops_gp106.c b/drivers/gpu/nvgpu/gp106/regops_gp106.c index 581b280d..30310486 100644 --- a/drivers/gpu/nvgpu/gp106/regops_gp106.c +++ b/drivers/gpu/nvgpu/gp106/regops_gp106.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 "gk20a/regops_gk20a.h" | 27 | #include "gk20a/regops_gk20a.h" |
27 | #include "regops_gp106.h" | 28 | #include "regops_gp106.h" |
28 | 29 | ||
diff --git a/drivers/gpu/nvgpu/gp106/sec2_gp106.c b/drivers/gpu/nvgpu/gp106/sec2_gp106.c index 40823b69..37c9d4ac 100644 --- a/drivers/gpu/nvgpu/gp106/sec2_gp106.c +++ b/drivers/gpu/nvgpu/gp106/sec2_gp106.c | |||
@@ -25,8 +25,8 @@ | |||
25 | #include <nvgpu/mm.h> | 25 | #include <nvgpu/mm.h> |
26 | #include <nvgpu/io.h> | 26 | #include <nvgpu/io.h> |
27 | #include <nvgpu/timers.h> | 27 | #include <nvgpu/timers.h> |
28 | #include <nvgpu/gk20a.h> | ||
28 | 29 | ||
29 | #include "gk20a/gk20a.h" | ||
30 | #include "sec2_gp106.h" | 30 | #include "sec2_gp106.h" |
31 | 31 | ||
32 | #include <nvgpu/hw/gp106/hw_pwr_gp106.h> | 32 | #include <nvgpu/hw/gp106/hw_pwr_gp106.h> |
diff --git a/drivers/gpu/nvgpu/gv100/bios_gv100.c b/drivers/gpu/nvgpu/gv100/bios_gv100.c index a1a3d053..a97b9efb 100644 --- a/drivers/gpu/nvgpu/gv100/bios_gv100.c +++ b/drivers/gpu/nvgpu/gv100/bios_gv100.c | |||
@@ -24,8 +24,8 @@ | |||
24 | #include <nvgpu/nvgpu_common.h> | 24 | #include <nvgpu/nvgpu_common.h> |
25 | #include <nvgpu/timers.h> | 25 | #include <nvgpu/timers.h> |
26 | #include <nvgpu/io.h> | 26 | #include <nvgpu/io.h> |
27 | #include <nvgpu/gk20a.h> | ||
27 | 28 | ||
28 | #include "gk20a/gk20a.h" | ||
29 | #include "gp106/bios_gp106.h" | 29 | #include "gp106/bios_gp106.h" |
30 | #include "bios_gv100.h" | 30 | #include "bios_gv100.h" |
31 | 31 | ||
diff --git a/drivers/gpu/nvgpu/gv100/fifo_gv100.c b/drivers/gpu/nvgpu/gv100/fifo_gv100.c index 1dedb7d4..0b5515f2 100644 --- a/drivers/gpu/nvgpu/gv100/fifo_gv100.c +++ b/drivers/gpu/nvgpu/gv100/fifo_gv100.c | |||
@@ -22,11 +22,12 @@ | |||
22 | * DEALINGS IN THE SOFTWARE. | 22 | * DEALINGS IN THE SOFTWARE. |
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include "gk20a/gk20a.h" | ||
26 | #include "fifo_gv100.h" | ||
27 | #include <nvgpu/timers.h> | 25 | #include <nvgpu/timers.h> |
28 | #include <nvgpu/ptimer.h> | 26 | #include <nvgpu/ptimer.h> |
29 | #include <nvgpu/io.h> | 27 | #include <nvgpu/io.h> |
28 | #include <nvgpu/gk20a.h> | ||
29 | |||
30 | #include "fifo_gv100.h" | ||
30 | 31 | ||
31 | #include <nvgpu/hw/gv100/hw_ccsr_gv100.h> | 32 | #include <nvgpu/hw/gv100/hw_ccsr_gv100.h> |
32 | #include <nvgpu/hw/gk20a/hw_fifo_gk20a.h> | 33 | #include <nvgpu/hw/gk20a/hw_fifo_gk20a.h> |
diff --git a/drivers/gpu/nvgpu/gv100/flcn_gv100.c b/drivers/gpu/nvgpu/gv100/flcn_gv100.c index 900d9204..1c3a0a67 100644 --- a/drivers/gpu/nvgpu/gv100/flcn_gv100.c +++ b/drivers/gpu/nvgpu/gv100/flcn_gv100.c | |||
@@ -21,8 +21,8 @@ | |||
21 | */ | 21 | */ |
22 | #include <nvgpu/falcon.h> | 22 | #include <nvgpu/falcon.h> |
23 | #include <nvgpu/pmu.h> | 23 | #include <nvgpu/pmu.h> |
24 | #include <nvgpu/gk20a.h> | ||
24 | 25 | ||
25 | #include "gk20a/gk20a.h" | ||
26 | #include "gk20a/flcn_gk20a.h" | 26 | #include "gk20a/flcn_gk20a.h" |
27 | #include "gp106/flcn_gp106.h" | 27 | #include "gp106/flcn_gp106.h" |
28 | #include "gv100/flcn_gv100.h" | 28 | #include "gv100/flcn_gv100.h" |
diff --git a/drivers/gpu/nvgpu/gv100/gr_ctx_gv100.c b/drivers/gpu/nvgpu/gv100/gr_ctx_gv100.c index 8b50125e..06dd2088 100644 --- a/drivers/gpu/nvgpu/gv100/gr_ctx_gv100.c +++ b/drivers/gpu/nvgpu/gv100/gr_ctx_gv100.c | |||
@@ -1,7 +1,7 @@ | |||
1 | /* | 1 | /* |
2 | * GV100 Graphics Context | 2 | * GV100 Graphics Context |
3 | * | 3 | * |
4 | * Copyright (c) 2017, NVIDIA CORPORATION. All rights reserved. | 4 | * Copyright (c) 2017-2018, NVIDIA CORPORATION. All rights reserved. |
5 | * | 5 | * |
6 | * Permission is hereby granted, free of charge, to any person obtaining a | 6 | * Permission is hereby granted, free of charge, to any person obtaining a |
7 | * copy of this software and associated documentation files (the "Software"), | 7 | * copy of this software and associated documentation files (the "Software"), |
@@ -21,8 +21,8 @@ | |||
21 | * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER | 21 | * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
22 | * DEALINGS IN THE SOFTWARE. | 22 | * DEALINGS IN THE SOFTWARE. |
23 | */ | 23 | */ |
24 | #include <nvgpu/gk20a.h> | ||
24 | 25 | ||
25 | #include "gk20a/gk20a.h" | ||
26 | #include "gr_ctx_gv100.h" | 26 | #include "gr_ctx_gv100.h" |
27 | 27 | ||
28 | int gr_gv100_get_netlist_name(struct gk20a *g, int index, char *name) | 28 | int gr_gv100_get_netlist_name(struct gk20a *g, int index, char *name) |
diff --git a/drivers/gpu/nvgpu/gv100/gr_gv100.c b/drivers/gpu/nvgpu/gv100/gr_gv100.c index d5ace998..0d5692e1 100644 --- a/drivers/gpu/nvgpu/gv100/gr_gv100.c +++ b/drivers/gpu/nvgpu/gv100/gr_gv100.c | |||
@@ -26,8 +26,8 @@ | |||
26 | #include <nvgpu/debug.h> | 26 | #include <nvgpu/debug.h> |
27 | #include <nvgpu/enabled.h> | 27 | #include <nvgpu/enabled.h> |
28 | #include <nvgpu/io.h> | 28 | #include <nvgpu/io.h> |
29 | #include <nvgpu/gk20a.h> | ||
29 | 30 | ||
30 | #include "gk20a/gk20a.h" | ||
31 | #include "gk20a/gr_gk20a.h" | 31 | #include "gk20a/gr_gk20a.h" |
32 | #include "gk20a/gr_pri_gk20a.h" | 32 | #include "gk20a/gr_pri_gk20a.h" |
33 | 33 | ||
diff --git a/drivers/gpu/nvgpu/gv100/gv100.h b/drivers/gpu/nvgpu/gv100/gv100.h index 7cc1f77b..42862251 100644 --- a/drivers/gpu/nvgpu/gv100/gv100.h +++ b/drivers/gpu/nvgpu/gv100/gv100.h | |||
@@ -1,7 +1,7 @@ | |||
1 | /* | 1 | /* |
2 | * GV100 Graphics | 2 | * GV100 Graphics |
3 | * | 3 | * |
4 | * Copyright (c) 2017, NVIDIA CORPORATION. All rights reserved. | 4 | * Copyright (c) 2017-2018, NVIDIA CORPORATION. All rights reserved. |
5 | * | 5 | * |
6 | * Permission is hereby granted, free of charge, to any person obtaining a | 6 | * Permission is hereby granted, free of charge, to any person obtaining a |
7 | * copy of this software and associated documentation files (the "Software"), | 7 | * copy of this software and associated documentation files (the "Software"), |
@@ -25,7 +25,7 @@ | |||
25 | #ifndef GV100_H | 25 | #ifndef GV100_H |
26 | #define GV100_H | 26 | #define GV100_H |
27 | 27 | ||
28 | #include "gk20a/gk20a.h" | 28 | #include <nvgpu/gk20a.h> |
29 | 29 | ||
30 | int gv100_init_gpu_characteristics(struct gk20a *g); | 30 | int gv100_init_gpu_characteristics(struct gk20a *g); |
31 | 31 | ||
diff --git a/drivers/gpu/nvgpu/gv100/hal_gv100.c b/drivers/gpu/nvgpu/gv100/hal_gv100.c index 6d37f4a2..26584bb4 100644 --- a/drivers/gpu/nvgpu/gv100/hal_gv100.c +++ b/drivers/gpu/nvgpu/gv100/hal_gv100.c | |||
@@ -50,7 +50,6 @@ | |||
50 | #include "common/mc/mc_gv11b.h" | 50 | #include "common/mc/mc_gv11b.h" |
51 | #include "common/mc/mc_gv100.h" | 51 | #include "common/mc/mc_gv100.h" |
52 | 52 | ||
53 | #include "gk20a/gk20a.h" | ||
54 | #include "gk20a/fifo_gk20a.h" | 53 | #include "gk20a/fifo_gk20a.h" |
55 | #include "gk20a/fecs_trace_gk20a.h" | 54 | #include "gk20a/fecs_trace_gk20a.h" |
56 | #include "gk20a/css_gr_gk20a.h" | 55 | #include "gk20a/css_gr_gk20a.h" |
@@ -115,6 +114,7 @@ | |||
115 | #include <nvgpu/ctxsw_trace.h> | 114 | #include <nvgpu/ctxsw_trace.h> |
116 | #include <nvgpu/error_notifier.h> | 115 | #include <nvgpu/error_notifier.h> |
117 | #include <nvgpu/clk_arb.h> | 116 | #include <nvgpu/clk_arb.h> |
117 | #include <nvgpu/gk20a.h> | ||
118 | #include <nvgpu/channel.h> | 118 | #include <nvgpu/channel.h> |
119 | 119 | ||
120 | #include <nvgpu/hw/gv100/hw_proj_gv100.h> | 120 | #include <nvgpu/hw/gv100/hw_proj_gv100.h> |
diff --git a/drivers/gpu/nvgpu/gv100/mm_gv100.c b/drivers/gpu/nvgpu/gv100/mm_gv100.c index 77a0ac4d..43bff760 100644 --- a/drivers/gpu/nvgpu/gv100/mm_gv100.c +++ b/drivers/gpu/nvgpu/gv100/mm_gv100.c | |||
@@ -24,8 +24,8 @@ | |||
24 | 24 | ||
25 | #include <nvgpu/sizes.h> | 25 | #include <nvgpu/sizes.h> |
26 | #include <nvgpu/io.h> | 26 | #include <nvgpu/io.h> |
27 | #include <nvgpu/gk20a.h> | ||
27 | 28 | ||
28 | #include "gk20a/gk20a.h" | ||
29 | #include "gv100/mm_gv100.h" | 29 | #include "gv100/mm_gv100.h" |
30 | 30 | ||
31 | u32 gv100_mm_get_flush_retries(struct gk20a *g, enum nvgpu_flush_op op) | 31 | u32 gv100_mm_get_flush_retries(struct gk20a *g, enum nvgpu_flush_op op) |
diff --git a/drivers/gpu/nvgpu/gv100/nvlink_gv100.c b/drivers/gpu/nvgpu/gv100/nvlink_gv100.c index 7457c181..7bbac293 100644 --- a/drivers/gpu/nvgpu/gv100/nvlink_gv100.c +++ b/drivers/gpu/nvgpu/gv100/nvlink_gv100.c | |||
@@ -31,8 +31,8 @@ | |||
31 | #include <nvgpu/io.h> | 31 | #include <nvgpu/io.h> |
32 | #include <nvgpu/utils.h> | 32 | #include <nvgpu/utils.h> |
33 | #include <nvgpu/timers.h> | 33 | #include <nvgpu/timers.h> |
34 | #include <nvgpu/gk20a.h> | ||
34 | 35 | ||
35 | #include "gk20a/gk20a.h" | ||
36 | #include "nvlink_gv100.h" | 36 | #include "nvlink_gv100.h" |
37 | 37 | ||
38 | #include <nvgpu/hw/gv100/hw_top_gv100.h> | 38 | #include <nvgpu/hw/gv100/hw_top_gv100.h> |
diff --git a/drivers/gpu/nvgpu/gv100/perf_gv100.c b/drivers/gpu/nvgpu/gv100/perf_gv100.c index f3ba78ba..ea4c3662 100644 --- a/drivers/gpu/nvgpu/gv100/perf_gv100.c +++ b/drivers/gpu/nvgpu/gv100/perf_gv100.c | |||
@@ -24,8 +24,8 @@ | |||
24 | 24 | ||
25 | #include <nvgpu/pmu.h> | 25 | #include <nvgpu/pmu.h> |
26 | #include <nvgpu/bug.h> | 26 | #include <nvgpu/bug.h> |
27 | #include <nvgpu/gk20a.h> | ||
27 | 28 | ||
28 | #include "gk20a/gk20a.h" | ||
29 | #include "gv100/perf_gv100.h" | 29 | #include "gv100/perf_gv100.h" |
30 | 30 | ||
31 | static int pmu_set_boot_clk_runcb_fn(void *arg) | 31 | static int pmu_set_boot_clk_runcb_fn(void *arg) |
diff --git a/drivers/gpu/nvgpu/gv100/pmu_gv100.c b/drivers/gpu/nvgpu/gv100/pmu_gv100.c index 9317f6b4..22f50f57 100644 --- a/drivers/gpu/nvgpu/gv100/pmu_gv100.c +++ b/drivers/gpu/nvgpu/gv100/pmu_gv100.c | |||
@@ -23,8 +23,8 @@ | |||
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include <nvgpu/pmu.h> | 25 | #include <nvgpu/pmu.h> |
26 | #include <nvgpu/gk20a.h> | ||
26 | 27 | ||
27 | #include "gk20a/gk20a.h" | ||
28 | #include "gv100/pmu_gv100.h" | 28 | #include "gv100/pmu_gv100.h" |
29 | 29 | ||
30 | int gv100_pmu_init_acr(struct gk20a *g) | 30 | int gv100_pmu_init_acr(struct gk20a *g) |
diff --git a/drivers/gpu/nvgpu/gv100/regops_gv100.c b/drivers/gpu/nvgpu/gv100/regops_gv100.c index baf57c78..7d4da938 100644 --- a/drivers/gpu/nvgpu/gv100/regops_gv100.c +++ b/drivers/gpu/nvgpu/gv100/regops_gv100.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 "gk20a/regops_gk20a.h" | 27 | #include "gk20a/regops_gk20a.h" |
27 | #include "regops_gv100.h" | 28 | #include "regops_gv100.h" |
28 | 29 | ||