diff options
Diffstat (limited to 'drivers/gpu')
77 files changed, 87 insertions, 8 deletions
diff --git a/drivers/gpu/nvgpu/clk/clk_vin.c b/drivers/gpu/nvgpu/clk/clk_vin.c index 66efefef..4e6fbe50 100644 --- a/drivers/gpu/nvgpu/clk/clk_vin.c +++ b/drivers/gpu/nvgpu/clk/clk_vin.c | |||
@@ -22,6 +22,7 @@ | |||
22 | 22 | ||
23 | #include <nvgpu/bios.h> | 23 | #include <nvgpu/bios.h> |
24 | #include <nvgpu/pmuif/nvgpu_gpmu_cmdif.h> | 24 | #include <nvgpu/pmuif/nvgpu_gpmu_cmdif.h> |
25 | #include <nvgpu/io.h> | ||
25 | 26 | ||
26 | #include "gk20a/gk20a.h" | 27 | #include "gk20a/gk20a.h" |
27 | 28 | ||
diff --git a/drivers/gpu/nvgpu/common/bus/bus_gk20a.c b/drivers/gpu/nvgpu/common/bus/bus_gk20a.c index d4ef41c1..d0091cee 100644 --- a/drivers/gpu/nvgpu/common/bus/bus_gk20a.c +++ b/drivers/gpu/nvgpu/common/bus/bus_gk20a.c | |||
@@ -23,6 +23,7 @@ | |||
23 | #include <nvgpu/log.h> | 23 | #include <nvgpu/log.h> |
24 | #include <nvgpu/soc.h> | 24 | #include <nvgpu/soc.h> |
25 | #include <nvgpu/mm.h> | 25 | #include <nvgpu/mm.h> |
26 | #include <nvgpu/io.h> | ||
26 | 27 | ||
27 | #include "gk20a/gk20a.h" | 28 | #include "gk20a/gk20a.h" |
28 | #include "bus_gk20a.h" | 29 | #include "bus_gk20a.h" |
diff --git a/drivers/gpu/nvgpu/common/bus/bus_gm20b.c b/drivers/gpu/nvgpu/common/bus/bus_gm20b.c index 669cb0ae..d2c4c2b7 100644 --- a/drivers/gpu/nvgpu/common/bus/bus_gm20b.c +++ b/drivers/gpu/nvgpu/common/bus/bus_gm20b.c | |||
@@ -25,6 +25,7 @@ | |||
25 | #include <nvgpu/timers.h> | 25 | #include <nvgpu/timers.h> |
26 | #include <nvgpu/mm.h> | 26 | #include <nvgpu/mm.h> |
27 | #include <nvgpu/enabled.h> | 27 | #include <nvgpu/enabled.h> |
28 | #include <nvgpu/io.h> | ||
28 | 29 | ||
29 | #include "gk20a/gk20a.h" | 30 | #include "gk20a/gk20a.h" |
30 | #include "bus_gm20b.h" | 31 | #include "bus_gm20b.h" |
diff --git a/drivers/gpu/nvgpu/common/bus/bus_gp10b.c b/drivers/gpu/nvgpu/common/bus/bus_gp10b.c index 86b548f2..11e60c53 100644 --- a/drivers/gpu/nvgpu/common/bus/bus_gp10b.c +++ b/drivers/gpu/nvgpu/common/bus/bus_gp10b.c | |||
@@ -22,6 +22,7 @@ | |||
22 | 22 | ||
23 | #include <nvgpu/timers.h> | 23 | #include <nvgpu/timers.h> |
24 | #include <nvgpu/mm.h> | 24 | #include <nvgpu/mm.h> |
25 | #include <nvgpu/io.h> | ||
25 | 26 | ||
26 | #include "bus_gp10b.h" | 27 | #include "bus_gp10b.h" |
27 | #include "gk20a/gk20a.h" | 28 | #include "gk20a/gk20a.h" |
diff --git a/drivers/gpu/nvgpu/common/bus/bus_gv100.c b/drivers/gpu/nvgpu/common/bus/bus_gv100.c index 2aa15e67..eb0387e6 100644 --- a/drivers/gpu/nvgpu/common/bus/bus_gv100.c +++ b/drivers/gpu/nvgpu/common/bus/bus_gv100.c | |||
@@ -22,6 +22,7 @@ | |||
22 | 22 | ||
23 | #include <nvgpu/timers.h> | 23 | #include <nvgpu/timers.h> |
24 | #include <nvgpu/mm.h> | 24 | #include <nvgpu/mm.h> |
25 | #include <nvgpu/io.h> | ||
25 | 26 | ||
26 | #include "bus_gv100.h" | 27 | #include "bus_gv100.h" |
27 | #include "gk20a/gk20a.h" | 28 | #include "gk20a/gk20a.h" |
diff --git a/drivers/gpu/nvgpu/common/fb/fb_gk20a.c b/drivers/gpu/nvgpu/common/fb/fb_gk20a.c index d27ac9d0..14634923 100644 --- a/drivers/gpu/nvgpu/common/fb/fb_gk20a.c +++ b/drivers/gpu/nvgpu/common/fb/fb_gk20a.c | |||
@@ -29,6 +29,7 @@ | |||
29 | #include "fb_gk20a.h" | 29 | #include "fb_gk20a.h" |
30 | 30 | ||
31 | #include <nvgpu/timers.h> | 31 | #include <nvgpu/timers.h> |
32 | #include <nvgpu/io.h> | ||
32 | 33 | ||
33 | #include <nvgpu/hw/gk20a/hw_mc_gk20a.h> | 34 | #include <nvgpu/hw/gk20a/hw_mc_gk20a.h> |
34 | #include <nvgpu/hw/gk20a/hw_fb_gk20a.h> | 35 | #include <nvgpu/hw/gk20a/hw_fb_gk20a.h> |
diff --git a/drivers/gpu/nvgpu/common/fb/fb_gm20b.c b/drivers/gpu/nvgpu/common/fb/fb_gm20b.c index bd093b31..00ae7b5f 100644 --- a/drivers/gpu/nvgpu/common/fb/fb_gm20b.c +++ b/drivers/gpu/nvgpu/common/fb/fb_gm20b.c | |||
@@ -29,6 +29,8 @@ | |||
29 | #include "fb_gk20a.h" | 29 | #include "fb_gk20a.h" |
30 | #include "fb_gm20b.h" | 30 | #include "fb_gm20b.h" |
31 | 31 | ||
32 | #include <nvgpu/io.h> | ||
33 | |||
32 | #include <nvgpu/hw/gm20b/hw_fb_gm20b.h> | 34 | #include <nvgpu/hw/gm20b/hw_fb_gm20b.h> |
33 | #include <nvgpu/hw/gm20b/hw_top_gm20b.h> | 35 | #include <nvgpu/hw/gm20b/hw_top_gm20b.h> |
34 | #include <nvgpu/hw/gm20b/hw_gmmu_gm20b.h> | 36 | #include <nvgpu/hw/gm20b/hw_gmmu_gm20b.h> |
diff --git a/drivers/gpu/nvgpu/common/fb/fb_gp106.c b/drivers/gpu/nvgpu/common/fb/fb_gp106.c index 6f257db4..094f9fa4 100644 --- a/drivers/gpu/nvgpu/common/fb/fb_gp106.c +++ b/drivers/gpu/nvgpu/common/fb/fb_gp106.c | |||
@@ -25,6 +25,8 @@ | |||
25 | #include "fb_gp10b.h" | 25 | #include "fb_gp10b.h" |
26 | #include "fb_gp106.h" | 26 | #include "fb_gp106.h" |
27 | 27 | ||
28 | #include <nvgpu/io.h> | ||
29 | |||
28 | #include <nvgpu/hw/gp106/hw_fb_gp106.h> | 30 | #include <nvgpu/hw/gp106/hw_fb_gp106.h> |
29 | 31 | ||
30 | #define HW_SCRUB_TIMEOUT_DEFAULT 100 /* usec */ | 32 | #define HW_SCRUB_TIMEOUT_DEFAULT 100 /* usec */ |
diff --git a/drivers/gpu/nvgpu/common/fb/fb_gv100.c b/drivers/gpu/nvgpu/common/fb/fb_gv100.c index 155c1e8b..8857f02b 100644 --- a/drivers/gpu/nvgpu/common/fb/fb_gv100.c +++ b/drivers/gpu/nvgpu/common/fb/fb_gv100.c | |||
@@ -35,6 +35,7 @@ | |||
35 | #include <nvgpu/firmware.h> | 35 | #include <nvgpu/firmware.h> |
36 | #include <nvgpu/pmu.h> | 36 | #include <nvgpu/pmu.h> |
37 | #include <nvgpu/falcon.h> | 37 | #include <nvgpu/falcon.h> |
38 | #include <nvgpu/io.h> | ||
38 | 39 | ||
39 | #include "gk20a/gk20a.h" | 40 | #include "gk20a/gk20a.h" |
40 | #include "gm20b/acr_gm20b.h" | 41 | #include "gm20b/acr_gm20b.h" |
diff --git a/drivers/gpu/nvgpu/common/fb/fb_gv11b.c b/drivers/gpu/nvgpu/common/fb/fb_gv11b.c index a7e5de68..664b2dd1 100644 --- a/drivers/gpu/nvgpu/common/fb/fb_gv11b.c +++ b/drivers/gpu/nvgpu/common/fb/fb_gv11b.c | |||
@@ -30,6 +30,7 @@ | |||
30 | #include <nvgpu/bug.h> | 30 | #include <nvgpu/bug.h> |
31 | #include <nvgpu/soc.h> | 31 | #include <nvgpu/soc.h> |
32 | #include <nvgpu/ptimer.h> | 32 | #include <nvgpu/ptimer.h> |
33 | #include <nvgpu/io.h> | ||
33 | 34 | ||
34 | #include "gk20a/gk20a.h" | 35 | #include "gk20a/gk20a.h" |
35 | #include "gk20a/mm_gk20a.h" | 36 | #include "gk20a/mm_gk20a.h" |
diff --git a/drivers/gpu/nvgpu/common/pramin.c b/drivers/gpu/nvgpu/common/pramin.c index 99d588aa..ba6a92ba 100644 --- a/drivers/gpu/nvgpu/common/pramin.c +++ b/drivers/gpu/nvgpu/common/pramin.c | |||
@@ -24,6 +24,7 @@ | |||
24 | #include <nvgpu/page_allocator.h> | 24 | #include <nvgpu/page_allocator.h> |
25 | #include <nvgpu/enabled.h> | 25 | #include <nvgpu/enabled.h> |
26 | #include <nvgpu/sizes.h> | 26 | #include <nvgpu/sizes.h> |
27 | #include <nvgpu/io.h> | ||
27 | 28 | ||
28 | #include "gk20a/gk20a.h" | 29 | #include "gk20a/gk20a.h" |
29 | 30 | ||
diff --git a/drivers/gpu/nvgpu/common/ptimer/ptimer_gk20a.c b/drivers/gpu/nvgpu/common/ptimer/ptimer_gk20a.c index 52e47601..0b3188ee 100644 --- a/drivers/gpu/nvgpu/common/ptimer/ptimer_gk20a.c +++ b/drivers/gpu/nvgpu/common/ptimer/ptimer_gk20a.c | |||
@@ -21,6 +21,7 @@ | |||
21 | */ | 21 | */ |
22 | 22 | ||
23 | #include <nvgpu/log.h> | 23 | #include <nvgpu/log.h> |
24 | #include <nvgpu/io.h> | ||
24 | 25 | ||
25 | #include "gk20a/gk20a.h" | 26 | #include "gk20a/gk20a.h" |
26 | #include "ptimer_gk20a.h" | 27 | #include "ptimer_gk20a.h" |
diff --git a/drivers/gpu/nvgpu/common/sim_pci.c b/drivers/gpu/nvgpu/common/sim_pci.c index b05504fe..65950c4c 100644 --- a/drivers/gpu/nvgpu/common/sim_pci.c +++ b/drivers/gpu/nvgpu/common/sim_pci.c | |||
@@ -25,6 +25,7 @@ | |||
25 | #include <nvgpu/dma.h> | 25 | #include <nvgpu/dma.h> |
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 "gk20a/gk20a.h" | 29 | #include "gk20a/gk20a.h" |
29 | 30 | ||
30 | static inline u32 sim_msg_header_size(void) | 31 | static inline u32 sim_msg_header_size(void) |
diff --git a/drivers/gpu/nvgpu/common/vbios/bios.c b/drivers/gpu/nvgpu/common/vbios/bios.c index de1b30e8..12c0eded 100644 --- a/drivers/gpu/nvgpu/common/vbios/bios.c +++ b/drivers/gpu/nvgpu/common/vbios/bios.c | |||
@@ -21,6 +21,7 @@ | |||
21 | */ | 21 | */ |
22 | 22 | ||
23 | #include <nvgpu/bios.h> | 23 | #include <nvgpu/bios.h> |
24 | #include <nvgpu/io.h> | ||
24 | #include <nvgpu/hw/gp106/hw_gc6_gp106.h> | 25 | #include <nvgpu/hw/gp106/hw_gc6_gp106.h> |
25 | 26 | ||
26 | #include "gk20a/gk20a.h" | 27 | #include "gk20a/gk20a.h" |
diff --git a/drivers/gpu/nvgpu/gk20a/ce2_gk20a.c b/drivers/gpu/nvgpu/gk20a/ce2_gk20a.c index 086d4e7b..a012949b 100644 --- a/drivers/gpu/nvgpu/gk20a/ce2_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/ce2_gk20a.c | |||
@@ -30,6 +30,7 @@ | |||
30 | 30 | ||
31 | #include <nvgpu/log.h> | 31 | #include <nvgpu/log.h> |
32 | #include <nvgpu/enabled.h> | 32 | #include <nvgpu/enabled.h> |
33 | #include <nvgpu/io.h> | ||
33 | 34 | ||
34 | #include <nvgpu/hw/gk20a/hw_ce2_gk20a.h> | 35 | #include <nvgpu/hw/gk20a/hw_ce2_gk20a.h> |
35 | #include <nvgpu/hw/gk20a/hw_pbdma_gk20a.h> | 36 | #include <nvgpu/hw/gk20a/hw_pbdma_gk20a.h> |
diff --git a/drivers/gpu/nvgpu/gk20a/css_gr_gk20a.c b/drivers/gpu/nvgpu/gk20a/css_gr_gk20a.c index 6fd0d330..c174c5bc 100644 --- a/drivers/gpu/nvgpu/gk20a/css_gr_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/css_gr_gk20a.c | |||
@@ -31,6 +31,7 @@ | |||
31 | #include <nvgpu/barrier.h> | 31 | #include <nvgpu/barrier.h> |
32 | #include <nvgpu/log.h> | 32 | #include <nvgpu/log.h> |
33 | #include <nvgpu/bug.h> | 33 | #include <nvgpu/bug.h> |
34 | #include <nvgpu/io.h> | ||
34 | 35 | ||
35 | #include "gk20a.h" | 36 | #include "gk20a.h" |
36 | #include "css_gr_gk20a.h" | 37 | #include "css_gr_gk20a.h" |
diff --git a/drivers/gpu/nvgpu/gk20a/dbg_gpu_gk20a.c b/drivers/gpu/nvgpu/gk20a/dbg_gpu_gk20a.c index 7ec9f5d3..cac3f92a 100644 --- a/drivers/gpu/nvgpu/gk20a/dbg_gpu_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/dbg_gpu_gk20a.c | |||
@@ -28,6 +28,7 @@ | |||
28 | #include <nvgpu/atomic.h> | 28 | #include <nvgpu/atomic.h> |
29 | #include <nvgpu/mm.h> | 29 | #include <nvgpu/mm.h> |
30 | #include <nvgpu/bug.h> | 30 | #include <nvgpu/bug.h> |
31 | #include <nvgpu/io.h> | ||
31 | 32 | ||
32 | #include "gk20a.h" | 33 | #include "gk20a.h" |
33 | #include "gr_gk20a.h" | 34 | #include "gr_gk20a.h" |
diff --git a/drivers/gpu/nvgpu/gk20a/fecs_trace_gk20a.c b/drivers/gpu/nvgpu/gk20a/fecs_trace_gk20a.c index 59f7fab4..786ea50c 100644 --- a/drivers/gpu/nvgpu/gk20a/fecs_trace_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/fecs_trace_gk20a.c | |||
@@ -37,6 +37,7 @@ | |||
37 | #include <nvgpu/mm.h> | 37 | #include <nvgpu/mm.h> |
38 | #include <nvgpu/enabled.h> | 38 | #include <nvgpu/enabled.h> |
39 | #include <nvgpu/ctxsw_trace.h> | 39 | #include <nvgpu/ctxsw_trace.h> |
40 | #include <nvgpu/io.h> | ||
40 | 41 | ||
41 | #include "fecs_trace_gk20a.h" | 42 | #include "fecs_trace_gk20a.h" |
42 | #include "gk20a.h" | 43 | #include "gk20a.h" |
diff --git a/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c b/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c index 306f05a7..93ef211e 100644 --- a/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c | |||
@@ -41,6 +41,7 @@ | |||
41 | #include <nvgpu/ctxsw_trace.h> | 41 | #include <nvgpu/ctxsw_trace.h> |
42 | #include <nvgpu/error_notifier.h> | 42 | #include <nvgpu/error_notifier.h> |
43 | #include <nvgpu/ptimer.h> | 43 | #include <nvgpu/ptimer.h> |
44 | #include <nvgpu/io.h> | ||
44 | 45 | ||
45 | #include "gk20a.h" | 46 | #include "gk20a.h" |
46 | #include "mm_gk20a.h" | 47 | #include "mm_gk20a.h" |
diff --git a/drivers/gpu/nvgpu/gk20a/flcn_gk20a.c b/drivers/gpu/nvgpu/gk20a/flcn_gk20a.c index 520d9bb2..9ca7d91b 100644 --- a/drivers/gpu/nvgpu/gk20a/flcn_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/flcn_gk20a.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 | * Permission is hereby granted, free of charge, to any person obtaining a | 4 | * Permission is hereby granted, free of charge, to any person obtaining a |
5 | * copy of this software and associated documentation files (the "Software"), | 5 | * copy of this software and associated documentation files (the "Software"), |
@@ -21,6 +21,7 @@ | |||
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/io.h> | ||
24 | 25 | ||
25 | #include "gk20a/gk20a.h" | 26 | #include "gk20a/gk20a.h" |
26 | #include "gk20a/flcn_gk20a.h" | 27 | #include "gk20a/flcn_gk20a.h" |
diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.h b/drivers/gpu/nvgpu/gk20a/gk20a.h index 0df111c8..cfc9128d 100644 --- a/drivers/gpu/nvgpu/gk20a/gk20a.h +++ b/drivers/gpu/nvgpu/gk20a/gk20a.h | |||
@@ -47,7 +47,6 @@ struct nvgpu_ctxsw_trace_filter; | |||
47 | 47 | ||
48 | #include <nvgpu/lock.h> | 48 | #include <nvgpu/lock.h> |
49 | #include <nvgpu/thread.h> | 49 | #include <nvgpu/thread.h> |
50 | #include <nvgpu/io.h> | ||
51 | 50 | ||
52 | #include <nvgpu/mm.h> | 51 | #include <nvgpu/mm.h> |
53 | #include <nvgpu/as.h> | 52 | #include <nvgpu/as.h> |
diff --git a/drivers/gpu/nvgpu/gk20a/gr_ctx_gk20a.c b/drivers/gpu/nvgpu/gk20a/gr_ctx_gk20a.c index e357db19..956d0434 100644 --- a/drivers/gpu/nvgpu/gk20a/gr_ctx_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/gr_ctx_gk20a.c | |||
@@ -27,6 +27,7 @@ | |||
27 | #include <nvgpu/log.h> | 27 | #include <nvgpu/log.h> |
28 | #include <nvgpu/firmware.h> | 28 | #include <nvgpu/firmware.h> |
29 | #include <nvgpu/enabled.h> | 29 | #include <nvgpu/enabled.h> |
30 | #include <nvgpu/io.h> | ||
30 | 31 | ||
31 | #include "gk20a.h" | 32 | #include "gk20a.h" |
32 | #include "gr_ctx_gk20a.h" | 33 | #include "gr_ctx_gk20a.h" |
diff --git a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c index 40bd5413..e40f296e 100644 --- a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c | |||
@@ -39,6 +39,7 @@ | |||
39 | #include <nvgpu/ctxsw_trace.h> | 39 | #include <nvgpu/ctxsw_trace.h> |
40 | #include <nvgpu/error_notifier.h> | 40 | #include <nvgpu/error_notifier.h> |
41 | #include <nvgpu/ecc.h> | 41 | #include <nvgpu/ecc.h> |
42 | #include <nvgpu/io.h> | ||
42 | 43 | ||
43 | #include "gk20a.h" | 44 | #include "gk20a.h" |
44 | #include "gr_gk20a.h" | 45 | #include "gr_gk20a.h" |
diff --git a/drivers/gpu/nvgpu/gk20a/mc_gk20a.c b/drivers/gpu/nvgpu/gk20a/mc_gk20a.c index 69d165af..9ee24ed0 100644 --- a/drivers/gpu/nvgpu/gk20a/mc_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/mc_gk20a.c | |||
@@ -28,6 +28,7 @@ | |||
28 | #include <nvgpu/timers.h> | 28 | #include <nvgpu/timers.h> |
29 | #include <nvgpu/atomic.h> | 29 | #include <nvgpu/atomic.h> |
30 | #include <nvgpu/unit.h> | 30 | #include <nvgpu/unit.h> |
31 | #include <nvgpu/io.h> | ||
31 | 32 | ||
32 | #include <nvgpu/hw/gk20a/hw_mc_gk20a.h> | 33 | #include <nvgpu/hw/gk20a/hw_mc_gk20a.h> |
33 | 34 | ||
diff --git a/drivers/gpu/nvgpu/gk20a/mm_gk20a.c b/drivers/gpu/nvgpu/gk20a/mm_gk20a.c index a1b4866c..255404c3 100644 --- a/drivers/gpu/nvgpu/gk20a/mm_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/mm_gk20a.c | |||
@@ -40,6 +40,7 @@ | |||
40 | #include <nvgpu/enabled.h> | 40 | #include <nvgpu/enabled.h> |
41 | #include <nvgpu/vidmem.h> | 41 | #include <nvgpu/vidmem.h> |
42 | #include <nvgpu/sizes.h> | 42 | #include <nvgpu/sizes.h> |
43 | #include <nvgpu/io.h> | ||
43 | 44 | ||
44 | #include "gk20a.h" | 45 | #include "gk20a.h" |
45 | #include "mm_gk20a.h" | 46 | #include "mm_gk20a.h" |
diff --git a/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c b/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c index 400a49a3..11db5b23 100644 --- a/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c | |||
@@ -31,6 +31,7 @@ | |||
31 | #include <nvgpu/firmware.h> | 31 | #include <nvgpu/firmware.h> |
32 | #include <nvgpu/falcon.h> | 32 | #include <nvgpu/falcon.h> |
33 | #include <nvgpu/mm.h> | 33 | #include <nvgpu/mm.h> |
34 | #include <nvgpu/io.h> | ||
34 | 35 | ||
35 | #include "gk20a.h" | 36 | #include "gk20a.h" |
36 | #include "gr_gk20a.h" | 37 | #include "gr_gk20a.h" |
diff --git a/drivers/gpu/nvgpu/gk20a/priv_ring_gk20a.c b/drivers/gpu/nvgpu/gk20a/priv_ring_gk20a.c index adbaf94f..d63cfe5c 100644 --- a/drivers/gpu/nvgpu/gk20a/priv_ring_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/priv_ring_gk20a.c | |||
@@ -27,6 +27,7 @@ | |||
27 | #include <nvgpu/log.h> | 27 | #include <nvgpu/log.h> |
28 | #include <nvgpu/timers.h> | 28 | #include <nvgpu/timers.h> |
29 | #include <nvgpu/enabled.h> | 29 | #include <nvgpu/enabled.h> |
30 | #include <nvgpu/io.h> | ||
30 | 31 | ||
31 | #include <nvgpu/hw/gk20a/hw_mc_gk20a.h> | 32 | #include <nvgpu/hw/gk20a/hw_mc_gk20a.h> |
32 | #include <nvgpu/hw/gk20a/hw_pri_ringmaster_gk20a.h> | 33 | #include <nvgpu/hw/gk20a/hw_pri_ringmaster_gk20a.h> |
diff --git a/drivers/gpu/nvgpu/gk20a/regops_gk20a.c b/drivers/gpu/nvgpu/gk20a/regops_gk20a.c index 5b9f973b..a5595c15 100644 --- a/drivers/gpu/nvgpu/gk20a/regops_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/regops_gk20a.c | |||
@@ -30,6 +30,7 @@ | |||
30 | #include <nvgpu/log.h> | 30 | #include <nvgpu/log.h> |
31 | #include <nvgpu/bsearch.h> | 31 | #include <nvgpu/bsearch.h> |
32 | #include <nvgpu/bug.h> | 32 | #include <nvgpu/bug.h> |
33 | #include <nvgpu/io.h> | ||
33 | 34 | ||
34 | static int regop_bsearch_range_cmp(const void *pkey, const void *pelem) | 35 | static int regop_bsearch_range_cmp(const void *pkey, const void *pelem) |
35 | { | 36 | { |
diff --git a/drivers/gpu/nvgpu/gk20a/therm_gk20a.c b/drivers/gpu/nvgpu/gk20a/therm_gk20a.c index b08f3e0a..e86988ca 100644 --- a/drivers/gpu/nvgpu/gk20a/therm_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/therm_gk20a.c | |||
@@ -23,6 +23,7 @@ | |||
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include <nvgpu/enabled.h> | 25 | #include <nvgpu/enabled.h> |
26 | #include <nvgpu/io.h> | ||
26 | 27 | ||
27 | #include "gk20a.h" | 28 | #include "gk20a.h" |
28 | 29 | ||
diff --git a/drivers/gpu/nvgpu/gm20b/acr_gm20b.c b/drivers/gpu/nvgpu/gm20b/acr_gm20b.c index 1694a1ad..2350f362 100644 --- a/drivers/gpu/nvgpu/gm20b/acr_gm20b.c +++ b/drivers/gpu/nvgpu/gm20b/acr_gm20b.c | |||
@@ -33,6 +33,7 @@ | |||
33 | #include <nvgpu/falcon.h> | 33 | #include <nvgpu/falcon.h> |
34 | #include <nvgpu/enabled.h> | 34 | #include <nvgpu/enabled.h> |
35 | #include <nvgpu/mm.h> | 35 | #include <nvgpu/mm.h> |
36 | #include <nvgpu/io.h> | ||
36 | 37 | ||
37 | #include "gk20a/gk20a.h" | 38 | #include "gk20a/gk20a.h" |
38 | #include "gk20a/pmu_gk20a.h" | 39 | #include "gk20a/pmu_gk20a.h" |
diff --git a/drivers/gpu/nvgpu/gm20b/clk_gm20b.c b/drivers/gpu/nvgpu/gm20b/clk_gm20b.c index f47f6cf6..558415f8 100644 --- a/drivers/gpu/nvgpu/gm20b/clk_gm20b.c +++ b/drivers/gpu/nvgpu/gm20b/clk_gm20b.c | |||
@@ -30,6 +30,7 @@ | |||
30 | #include <nvgpu/bug.h> | 30 | #include <nvgpu/bug.h> |
31 | #include <nvgpu/log.h> | 31 | #include <nvgpu/log.h> |
32 | #include <nvgpu/types.h> | 32 | #include <nvgpu/types.h> |
33 | #include <nvgpu/io.h> | ||
33 | 34 | ||
34 | #include <nvgpu/hw/gm20b/hw_trim_gm20b.h> | 35 | #include <nvgpu/hw/gm20b/hw_trim_gm20b.h> |
35 | #include <nvgpu/hw/gm20b/hw_therm_gm20b.h> | 36 | #include <nvgpu/hw/gm20b/hw_therm_gm20b.h> |
diff --git a/drivers/gpu/nvgpu/gm20b/fifo_gm20b.c b/drivers/gpu/nvgpu/gm20b/fifo_gm20b.c index b73abeda..96262934 100644 --- a/drivers/gpu/nvgpu/gm20b/fifo_gm20b.c +++ b/drivers/gpu/nvgpu/gm20b/fifo_gm20b.c | |||
@@ -33,6 +33,7 @@ | |||
33 | #include <nvgpu/barrier.h> | 33 | #include <nvgpu/barrier.h> |
34 | #include <nvgpu/mm.h> | 34 | #include <nvgpu/mm.h> |
35 | #include <nvgpu/enabled.h> | 35 | #include <nvgpu/enabled.h> |
36 | #include <nvgpu/io.h> | ||
36 | 37 | ||
37 | #include <nvgpu/hw/gm20b/hw_ccsr_gm20b.h> | 38 | #include <nvgpu/hw/gm20b/hw_ccsr_gm20b.h> |
38 | #include <nvgpu/hw/gm20b/hw_ram_gm20b.h> | 39 | #include <nvgpu/hw/gm20b/hw_ram_gm20b.h> |
diff --git a/drivers/gpu/nvgpu/gm20b/fuse_gm20b.c b/drivers/gpu/nvgpu/gm20b/fuse_gm20b.c index 165d5b43..95ac8ee3 100644 --- a/drivers/gpu/nvgpu/gm20b/fuse_gm20b.c +++ b/drivers/gpu/nvgpu/gm20b/fuse_gm20b.c | |||
@@ -1,7 +1,7 @@ | |||
1 | /* | 1 | /* |
2 | * GM20B FUSE | 2 | * GM20B FUSE |
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,6 +25,7 @@ | |||
25 | #include <nvgpu/types.h> | 25 | #include <nvgpu/types.h> |
26 | #include <nvgpu/fuse.h> | 26 | #include <nvgpu/fuse.h> |
27 | #include <nvgpu/enabled.h> | 27 | #include <nvgpu/enabled.h> |
28 | #include <nvgpu/io.h> | ||
28 | 29 | ||
29 | #include "gk20a/gk20a.h" | 30 | #include "gk20a/gk20a.h" |
30 | 31 | ||
diff --git a/drivers/gpu/nvgpu/gm20b/gr_gm20b.c b/drivers/gpu/nvgpu/gm20b/gr_gm20b.c index 32ab58c1..6ee6afdb 100644 --- a/drivers/gpu/nvgpu/gm20b/gr_gm20b.c +++ b/drivers/gpu/nvgpu/gm20b/gr_gm20b.c | |||
@@ -27,6 +27,7 @@ | |||
27 | #include <nvgpu/enabled.h> | 27 | #include <nvgpu/enabled.h> |
28 | #include <nvgpu/debug.h> | 28 | #include <nvgpu/debug.h> |
29 | #include <nvgpu/fuse.h> | 29 | #include <nvgpu/fuse.h> |
30 | #include <nvgpu/io.h> | ||
30 | 31 | ||
31 | #include "gk20a/gk20a.h" | 32 | #include "gk20a/gk20a.h" |
32 | #include "gk20a/gr_gk20a.h" | 33 | #include "gk20a/gr_gk20a.h" |
diff --git a/drivers/gpu/nvgpu/gm20b/ltc_gm20b.c b/drivers/gpu/nvgpu/gm20b/ltc_gm20b.c index 9812c8d8..066e41f7 100644 --- a/drivers/gpu/nvgpu/gm20b/ltc_gm20b.c +++ b/drivers/gpu/nvgpu/gm20b/ltc_gm20b.c | |||
@@ -28,6 +28,7 @@ | |||
28 | #include <nvgpu/enabled.h> | 28 | #include <nvgpu/enabled.h> |
29 | #include <nvgpu/bug.h> | 29 | #include <nvgpu/bug.h> |
30 | #include <nvgpu/ltc.h> | 30 | #include <nvgpu/ltc.h> |
31 | #include <nvgpu/io.h> | ||
31 | 32 | ||
32 | #include <nvgpu/hw/gm20b/hw_mc_gm20b.h> | 33 | #include <nvgpu/hw/gm20b/hw_mc_gm20b.h> |
33 | #include <nvgpu/hw/gm20b/hw_ltc_gm20b.h> | 34 | #include <nvgpu/hw/gm20b/hw_ltc_gm20b.h> |
diff --git a/drivers/gpu/nvgpu/gm20b/pmu_gm20b.c b/drivers/gpu/nvgpu/gm20b/pmu_gm20b.c index aa992c37..731078f7 100644 --- a/drivers/gpu/nvgpu/gm20b/pmu_gm20b.c +++ b/drivers/gpu/nvgpu/gm20b/pmu_gm20b.c | |||
@@ -26,6 +26,7 @@ | |||
26 | #include <nvgpu/pmu.h> | 26 | #include <nvgpu/pmu.h> |
27 | #include <nvgpu/fuse.h> | 27 | #include <nvgpu/fuse.h> |
28 | #include <nvgpu/enabled.h> | 28 | #include <nvgpu/enabled.h> |
29 | #include <nvgpu/io.h> | ||
29 | 30 | ||
30 | #include "gk20a/gk20a.h" | 31 | #include "gk20a/gk20a.h" |
31 | #include "gk20a/pmu_gk20a.h" | 32 | #include "gk20a/pmu_gk20a.h" |
diff --git a/drivers/gpu/nvgpu/gm20b/therm_gm20b.c b/drivers/gpu/nvgpu/gm20b/therm_gm20b.c index dfe977ff..e2055376 100644 --- a/drivers/gpu/nvgpu/gm20b/therm_gm20b.c +++ b/drivers/gpu/nvgpu/gm20b/therm_gm20b.c | |||
@@ -22,6 +22,7 @@ | |||
22 | * DEALINGS IN THE SOFTWARE. | 22 | * DEALINGS IN THE SOFTWARE. |
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include <nvgpu/io.h> | ||
25 | #include "gk20a/gk20a.h" | 26 | #include "gk20a/gk20a.h" |
26 | 27 | ||
27 | #include "therm_gm20b.h" | 28 | #include "therm_gm20b.h" |
diff --git a/drivers/gpu/nvgpu/gp106/acr_gp106.c b/drivers/gpu/nvgpu/gp106/acr_gp106.c index 2b50d339..63386547 100644 --- a/drivers/gpu/nvgpu/gp106/acr_gp106.c +++ b/drivers/gpu/nvgpu/gp106/acr_gp106.c | |||
@@ -27,6 +27,7 @@ | |||
27 | #include <nvgpu/firmware.h> | 27 | #include <nvgpu/firmware.h> |
28 | #include <nvgpu/pmu.h> | 28 | #include <nvgpu/pmu.h> |
29 | #include <nvgpu/enabled.h> | 29 | #include <nvgpu/enabled.h> |
30 | #include <nvgpu/io.h> | ||
30 | 31 | ||
31 | #include "gk20a/gk20a.h" | 32 | #include "gk20a/gk20a.h" |
32 | #include "gk20a/pmu_gk20a.h" | 33 | #include "gk20a/pmu_gk20a.h" |
diff --git a/drivers/gpu/nvgpu/gp106/bios_gp106.c b/drivers/gpu/nvgpu/gp106/bios_gp106.c index 09d7b9af..deeae2fe 100644 --- a/drivers/gpu/nvgpu/gp106/bios_gp106.c +++ b/drivers/gpu/nvgpu/gp106/bios_gp106.c | |||
@@ -26,6 +26,7 @@ | |||
26 | #include <nvgpu/timers.h> | 26 | #include <nvgpu/timers.h> |
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 | 30 | ||
30 | #include "gk20a/gk20a.h" | 31 | #include "gk20a/gk20a.h" |
31 | #include "gm20b/fifo_gm20b.h" | 32 | #include "gm20b/fifo_gm20b.h" |
diff --git a/drivers/gpu/nvgpu/gp106/clk_gp106.c b/drivers/gpu/nvgpu/gp106/clk_gp106.c index 2c529e52..b1fa7cad 100644 --- a/drivers/gpu/nvgpu/gp106/clk_gp106.c +++ b/drivers/gpu/nvgpu/gp106/clk_gp106.c | |||
@@ -28,6 +28,7 @@ | |||
28 | #endif | 28 | #endif |
29 | 29 | ||
30 | #include <nvgpu/kmem.h> | 30 | #include <nvgpu/kmem.h> |
31 | #include <nvgpu/io.h> | ||
31 | 32 | ||
32 | #include "gk20a/gk20a.h" | 33 | #include "gk20a/gk20a.h" |
33 | #include "gp106/mclk_gp106.h" | 34 | #include "gp106/mclk_gp106.h" |
diff --git a/drivers/gpu/nvgpu/gp106/fuse_gp106.c b/drivers/gpu/nvgpu/gp106/fuse_gp106.c index 0303830c..82e3217f 100644 --- a/drivers/gpu/nvgpu/gp106/fuse_gp106.c +++ b/drivers/gpu/nvgpu/gp106/fuse_gp106.c | |||
@@ -23,6 +23,7 @@ | |||
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include <nvgpu/enabled.h> | 25 | #include <nvgpu/enabled.h> |
26 | #include <nvgpu/io.h> | ||
26 | 27 | ||
27 | #include "gk20a/gk20a.h" | 28 | #include "gk20a/gk20a.h" |
28 | #include "gp106/fuse_gp106.h" | 29 | #include "gp106/fuse_gp106.h" |
diff --git a/drivers/gpu/nvgpu/gp106/gr_gp106.c b/drivers/gpu/nvgpu/gp106/gr_gp106.c index 2e5f29ee..233357c8 100644 --- a/drivers/gpu/nvgpu/gp106/gr_gp106.c +++ b/drivers/gpu/nvgpu/gp106/gr_gp106.c | |||
@@ -29,6 +29,8 @@ | |||
29 | #include "gm20b/gr_gm20b.h" | 29 | #include "gm20b/gr_gm20b.h" |
30 | #include "gp10b/gr_gp10b.h" | 30 | #include "gp10b/gr_gp10b.h" |
31 | 31 | ||
32 | #include <nvgpu/io.h> | ||
33 | |||
32 | #include "gr_gp106.h" | 34 | #include "gr_gp106.h" |
33 | 35 | ||
34 | #include <nvgpu/hw/gp106/hw_gr_gp106.h> | 36 | #include <nvgpu/hw/gp106/hw_gr_gp106.h> |
diff --git a/drivers/gpu/nvgpu/gp106/mclk_gp106.c b/drivers/gpu/nvgpu/gp106/mclk_gp106.c index 4ea9e6f6..d4d3f370 100644 --- a/drivers/gpu/nvgpu/gp106/mclk_gp106.c +++ b/drivers/gpu/nvgpu/gp106/mclk_gp106.c | |||
@@ -24,6 +24,7 @@ | |||
24 | #include <nvgpu/bios.h> | 24 | #include <nvgpu/bios.h> |
25 | #include <nvgpu/kmem.h> | 25 | #include <nvgpu/kmem.h> |
26 | #include <nvgpu/timers.h> | 26 | #include <nvgpu/timers.h> |
27 | #include <nvgpu/io.h> | ||
27 | 28 | ||
28 | #include "gk20a/gk20a.h" | 29 | #include "gk20a/gk20a.h" |
29 | #ifdef CONFIG_DEBUG_FS | 30 | #ifdef CONFIG_DEBUG_FS |
diff --git a/drivers/gpu/nvgpu/gp106/mm_gp106.c b/drivers/gpu/nvgpu/gp106/mm_gp106.c index 88482a6f..4a3a4a19 100644 --- a/drivers/gpu/nvgpu/gp106/mm_gp106.c +++ b/drivers/gpu/nvgpu/gp106/mm_gp106.c | |||
@@ -1,7 +1,7 @@ | |||
1 | /* | 1 | /* |
2 | * GP106 memory management | 2 | * GP106 memory management |
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"), |
@@ -23,6 +23,7 @@ | |||
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include <nvgpu/sizes.h> | 25 | #include <nvgpu/sizes.h> |
26 | #include <nvgpu/io.h> | ||
26 | 27 | ||
27 | #include "gk20a/gk20a.h" | 28 | #include "gk20a/gk20a.h" |
28 | #include "gp10b/mm_gp10b.h" | 29 | #include "gp10b/mm_gp10b.h" |
diff --git a/drivers/gpu/nvgpu/gp106/pmu_gp106.c b/drivers/gpu/nvgpu/gp106/pmu_gp106.c index 2a52dd4e..005523dc 100644 --- a/drivers/gpu/nvgpu/gp106/pmu_gp106.c +++ b/drivers/gpu/nvgpu/gp106/pmu_gp106.c | |||
@@ -22,6 +22,7 @@ | |||
22 | 22 | ||
23 | #include <nvgpu/pmu.h> | 23 | #include <nvgpu/pmu.h> |
24 | #include <nvgpu/enabled.h> | 24 | #include <nvgpu/enabled.h> |
25 | #include <nvgpu/io.h> | ||
25 | 26 | ||
26 | #include "gk20a/gk20a.h" | 27 | #include "gk20a/gk20a.h" |
27 | #include "gk20a/pmu_gk20a.h" | 28 | #include "gk20a/pmu_gk20a.h" |
diff --git a/drivers/gpu/nvgpu/gp106/sec2_gp106.c b/drivers/gpu/nvgpu/gp106/sec2_gp106.c index 29fc2df0..6762d034 100644 --- a/drivers/gpu/nvgpu/gp106/sec2_gp106.c +++ b/drivers/gpu/nvgpu/gp106/sec2_gp106.c | |||
@@ -23,6 +23,7 @@ | |||
23 | #include <nvgpu/pmu.h> | 23 | #include <nvgpu/pmu.h> |
24 | #include <nvgpu/falcon.h> | 24 | #include <nvgpu/falcon.h> |
25 | #include <nvgpu/mm.h> | 25 | #include <nvgpu/mm.h> |
26 | #include <nvgpu/io.h> | ||
26 | 27 | ||
27 | #include "gk20a/gk20a.h" | 28 | #include "gk20a/gk20a.h" |
28 | #include "sec2_gp106.h" | 29 | #include "sec2_gp106.h" |
diff --git a/drivers/gpu/nvgpu/gp106/therm_gp106.c b/drivers/gpu/nvgpu/gp106/therm_gp106.c index b1f6fefb..ab465e6c 100644 --- a/drivers/gpu/nvgpu/gp106/therm_gp106.c +++ b/drivers/gpu/nvgpu/gp106/therm_gp106.c | |||
@@ -20,6 +20,7 @@ | |||
20 | * DEALINGS IN THE SOFTWARE. | 20 | * DEALINGS IN THE SOFTWARE. |
21 | */ | 21 | */ |
22 | 22 | ||
23 | #include <nvgpu/io.h> | ||
23 | #include "gk20a/gk20a.h" | 24 | #include "gk20a/gk20a.h" |
24 | 25 | ||
25 | #include "therm_gp106.h" | 26 | #include "therm_gp106.h" |
diff --git a/drivers/gpu/nvgpu/gp106/xve_gp106.c b/drivers/gpu/nvgpu/gp106/xve_gp106.c index e77ea5c1..40b0ff04 100644 --- a/drivers/gpu/nvgpu/gp106/xve_gp106.c +++ b/drivers/gpu/nvgpu/gp106/xve_gp106.c | |||
@@ -26,6 +26,7 @@ | |||
26 | 26 | ||
27 | #include <nvgpu/bug.h> | 27 | #include <nvgpu/bug.h> |
28 | #include <nvgpu/xve.h> | 28 | #include <nvgpu/xve.h> |
29 | #include <nvgpu/io.h> | ||
29 | 30 | ||
30 | #include <nvgpu/hw/gp106/hw_xp_gp106.h> | 31 | #include <nvgpu/hw/gp106/hw_xp_gp106.h> |
31 | #include <nvgpu/hw/gp106/hw_xve_gp106.h> | 32 | #include <nvgpu/hw/gp106/hw_xve_gp106.h> |
diff --git a/drivers/gpu/nvgpu/gp10b/ce_gp10b.c b/drivers/gpu/nvgpu/gp10b/ce_gp10b.c index e2ad1bd3..048a9ba0 100644 --- a/drivers/gpu/nvgpu/gp10b/ce_gp10b.c +++ b/drivers/gpu/nvgpu/gp10b/ce_gp10b.c | |||
@@ -22,6 +22,7 @@ | |||
22 | * DEALINGS IN THE SOFTWARE. | 22 | * DEALINGS IN THE SOFTWARE. |
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include <nvgpu/io.h> | ||
25 | #include "gk20a/gk20a.h" | 26 | #include "gk20a/gk20a.h" |
26 | 27 | ||
27 | #include "ce_gp10b.h" | 28 | #include "ce_gp10b.h" |
diff --git a/drivers/gpu/nvgpu/gp10b/fifo_gp10b.c b/drivers/gpu/nvgpu/gp10b/fifo_gp10b.c index 64bf4647..2e773594 100644 --- a/drivers/gpu/nvgpu/gp10b/fifo_gp10b.c +++ b/drivers/gpu/nvgpu/gp10b/fifo_gp10b.c | |||
@@ -26,6 +26,7 @@ | |||
26 | #include <nvgpu/bug.h> | 26 | #include <nvgpu/bug.h> |
27 | #include <nvgpu/log2.h> | 27 | #include <nvgpu/log2.h> |
28 | #include <nvgpu/enabled.h> | 28 | #include <nvgpu/enabled.h> |
29 | #include <nvgpu/io.h> | ||
29 | 30 | ||
30 | #include "fifo_gp10b.h" | 31 | #include "fifo_gp10b.h" |
31 | 32 | ||
diff --git a/drivers/gpu/nvgpu/gp10b/fuse_gp10b.c b/drivers/gpu/nvgpu/gp10b/fuse_gp10b.c index 52087676..a79d5e1c 100644 --- a/drivers/gpu/nvgpu/gp10b/fuse_gp10b.c +++ b/drivers/gpu/nvgpu/gp10b/fuse_gp10b.c | |||
@@ -25,6 +25,7 @@ | |||
25 | #include <nvgpu/types.h> | 25 | #include <nvgpu/types.h> |
26 | #include <nvgpu/fuse.h> | 26 | #include <nvgpu/fuse.h> |
27 | #include <nvgpu/enabled.h> | 27 | #include <nvgpu/enabled.h> |
28 | #include <nvgpu/io.h> | ||
28 | 29 | ||
29 | #include "gk20a/gk20a.h" | 30 | #include "gk20a/gk20a.h" |
30 | 31 | ||
diff --git a/drivers/gpu/nvgpu/gp10b/gp10b.c b/drivers/gpu/nvgpu/gp10b/gp10b.c index 7991944c..6e09b860 100644 --- a/drivers/gpu/nvgpu/gp10b/gp10b.c +++ b/drivers/gpu/nvgpu/gp10b/gp10b.c | |||
@@ -25,6 +25,7 @@ | |||
25 | #include "gk20a/gk20a.h" | 25 | #include "gk20a/gk20a.h" |
26 | 26 | ||
27 | #include <nvgpu/enabled.h> | 27 | #include <nvgpu/enabled.h> |
28 | #include <nvgpu/io.h> | ||
28 | 29 | ||
29 | #include "gp10b.h" | 30 | #include "gp10b.h" |
30 | 31 | ||
diff --git a/drivers/gpu/nvgpu/gp10b/gr_gp10b.c b/drivers/gpu/nvgpu/gp10b/gr_gp10b.c index 17c4e8b7..7792728c 100644 --- a/drivers/gpu/nvgpu/gp10b/gr_gp10b.c +++ b/drivers/gpu/nvgpu/gp10b/gr_gp10b.c | |||
@@ -30,6 +30,7 @@ | |||
30 | #include <nvgpu/debug.h> | 30 | #include <nvgpu/debug.h> |
31 | #include <nvgpu/fuse.h> | 31 | #include <nvgpu/fuse.h> |
32 | #include <nvgpu/enabled.h> | 32 | #include <nvgpu/enabled.h> |
33 | #include <nvgpu/io.h> | ||
33 | 34 | ||
34 | #include "gk20a/gk20a.h" | 35 | #include "gk20a/gk20a.h" |
35 | #include "gk20a/gr_gk20a.h" | 36 | #include "gk20a/gr_gk20a.h" |
diff --git a/drivers/gpu/nvgpu/gp10b/ltc_gp10b.c b/drivers/gpu/nvgpu/gp10b/ltc_gp10b.c index aeeda4a8..79ebe86d 100644 --- a/drivers/gpu/nvgpu/gp10b/ltc_gp10b.c +++ b/drivers/gpu/nvgpu/gp10b/ltc_gp10b.c | |||
@@ -27,6 +27,7 @@ | |||
27 | #include <nvgpu/ltc.h> | 27 | #include <nvgpu/ltc.h> |
28 | #include <nvgpu/log.h> | 28 | #include <nvgpu/log.h> |
29 | #include <nvgpu/enabled.h> | 29 | #include <nvgpu/enabled.h> |
30 | #include <nvgpu/io.h> | ||
30 | 31 | ||
31 | #include <nvgpu/hw/gp10b/hw_mc_gp10b.h> | 32 | #include <nvgpu/hw/gp10b/hw_mc_gp10b.h> |
32 | #include <nvgpu/hw/gp10b/hw_ltc_gp10b.h> | 33 | #include <nvgpu/hw/gp10b/hw_ltc_gp10b.h> |
diff --git a/drivers/gpu/nvgpu/gp10b/mc_gp10b.c b/drivers/gpu/nvgpu/gp10b/mc_gp10b.c index 8f4695ff..56db6750 100644 --- a/drivers/gpu/nvgpu/gp10b/mc_gp10b.c +++ b/drivers/gpu/nvgpu/gp10b/mc_gp10b.c | |||
@@ -23,6 +23,7 @@ | |||
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include "gk20a/gk20a.h" | 25 | #include "gk20a/gk20a.h" |
26 | #include <nvgpu/io.h> | ||
26 | 27 | ||
27 | #include "mc_gp10b.h" | 28 | #include "mc_gp10b.h" |
28 | 29 | ||
diff --git a/drivers/gpu/nvgpu/gp10b/pmu_gp10b.c b/drivers/gpu/nvgpu/gp10b/pmu_gp10b.c index ca111725..6ecb7957 100644 --- a/drivers/gpu/nvgpu/gp10b/pmu_gp10b.c +++ b/drivers/gpu/nvgpu/gp10b/pmu_gp10b.c | |||
@@ -26,6 +26,7 @@ | |||
26 | #include <nvgpu/log.h> | 26 | #include <nvgpu/log.h> |
27 | #include <nvgpu/fuse.h> | 27 | #include <nvgpu/fuse.h> |
28 | #include <nvgpu/enabled.h> | 28 | #include <nvgpu/enabled.h> |
29 | #include <nvgpu/io.h> | ||
29 | 30 | ||
30 | #include "gk20a/gk20a.h" | 31 | #include "gk20a/gk20a.h" |
31 | #include "gk20a/pmu_gk20a.h" | 32 | #include "gk20a/pmu_gk20a.h" |
diff --git a/drivers/gpu/nvgpu/gp10b/priv_ring_gp10b.c b/drivers/gpu/nvgpu/gp10b/priv_ring_gp10b.c index 0d5e6a8a..87d9c28d 100644 --- a/drivers/gpu/nvgpu/gp10b/priv_ring_gp10b.c +++ b/drivers/gpu/nvgpu/gp10b/priv_ring_gp10b.c | |||
@@ -27,6 +27,7 @@ | |||
27 | #include <nvgpu/log.h> | 27 | #include <nvgpu/log.h> |
28 | #include <nvgpu/timers.h> | 28 | #include <nvgpu/timers.h> |
29 | #include <nvgpu/enabled.h> | 29 | #include <nvgpu/enabled.h> |
30 | #include <nvgpu/io.h> | ||
30 | 31 | ||
31 | #include <nvgpu/hw/gp10b/hw_mc_gp10b.h> | 32 | #include <nvgpu/hw/gp10b/hw_mc_gp10b.h> |
32 | #include <nvgpu/hw/gp10b/hw_pri_ringmaster_gp10b.h> | 33 | #include <nvgpu/hw/gp10b/hw_pri_ringmaster_gp10b.h> |
diff --git a/drivers/gpu/nvgpu/gp10b/therm_gp10b.c b/drivers/gpu/nvgpu/gp10b/therm_gp10b.c index 4f1de559..03be6d4a 100644 --- a/drivers/gpu/nvgpu/gp10b/therm_gp10b.c +++ b/drivers/gpu/nvgpu/gp10b/therm_gp10b.c | |||
@@ -26,6 +26,7 @@ | |||
26 | #include "therm_gp10b.h" | 26 | #include "therm_gp10b.h" |
27 | 27 | ||
28 | #include <nvgpu/soc.h> | 28 | #include <nvgpu/soc.h> |
29 | #include <nvgpu/io.h> | ||
29 | 30 | ||
30 | #include <nvgpu/hw/gp10b/hw_therm_gp10b.h> | 31 | #include <nvgpu/hw/gp10b/hw_therm_gp10b.h> |
31 | 32 | ||
diff --git a/drivers/gpu/nvgpu/gv100/bios_gv100.c b/drivers/gpu/nvgpu/gv100/bios_gv100.c index 45d5ed31..a1a3d053 100644 --- a/drivers/gpu/nvgpu/gv100/bios_gv100.c +++ b/drivers/gpu/nvgpu/gv100/bios_gv100.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 | * Permission is hereby granted, free of charge, to any person obtaining a | 4 | * Permission is hereby granted, free of charge, to any person obtaining a |
5 | * copy of this software and associated documentation files (the "Software"), | 5 | * copy of this software and associated documentation files (the "Software"), |
@@ -23,6 +23,7 @@ | |||
23 | #include <nvgpu/bios.h> | 23 | #include <nvgpu/bios.h> |
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 | 27 | ||
27 | #include "gk20a/gk20a.h" | 28 | #include "gk20a/gk20a.h" |
28 | #include "gp106/bios_gp106.h" | 29 | #include "gp106/bios_gp106.h" |
diff --git a/drivers/gpu/nvgpu/gv100/fifo_gv100.c b/drivers/gpu/nvgpu/gv100/fifo_gv100.c index 242e48f9..1dedb7d4 100644 --- a/drivers/gpu/nvgpu/gv100/fifo_gv100.c +++ b/drivers/gpu/nvgpu/gv100/fifo_gv100.c | |||
@@ -26,6 +26,7 @@ | |||
26 | #include "fifo_gv100.h" | 26 | #include "fifo_gv100.h" |
27 | #include <nvgpu/timers.h> | 27 | #include <nvgpu/timers.h> |
28 | #include <nvgpu/ptimer.h> | 28 | #include <nvgpu/ptimer.h> |
29 | #include <nvgpu/io.h> | ||
29 | 30 | ||
30 | #include <nvgpu/hw/gv100/hw_ccsr_gv100.h> | 31 | #include <nvgpu/hw/gv100/hw_ccsr_gv100.h> |
31 | #include <nvgpu/hw/gk20a/hw_fifo_gk20a.h> | 32 | #include <nvgpu/hw/gk20a/hw_fifo_gk20a.h> |
diff --git a/drivers/gpu/nvgpu/gv100/gr_gv100.c b/drivers/gpu/nvgpu/gv100/gr_gv100.c index 5f891ce5..97affdd9 100644 --- a/drivers/gpu/nvgpu/gv100/gr_gv100.c +++ b/drivers/gpu/nvgpu/gv100/gr_gv100.c | |||
@@ -25,6 +25,7 @@ | |||
25 | #include <nvgpu/log.h> | 25 | #include <nvgpu/log.h> |
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 | 29 | ||
29 | #include "gk20a/gk20a.h" | 30 | #include "gk20a/gk20a.h" |
30 | #include "gk20a/gr_gk20a.h" | 31 | #include "gk20a/gr_gk20a.h" |
diff --git a/drivers/gpu/nvgpu/gv100/mc_gv100.c b/drivers/gpu/nvgpu/gv100/mc_gv100.c index 7d38a3fb..069a012a 100644 --- a/drivers/gpu/nvgpu/gv100/mc_gv100.c +++ b/drivers/gpu/nvgpu/gv100/mc_gv100.c | |||
@@ -23,6 +23,7 @@ | |||
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include <nvgpu/types.h> | 25 | #include <nvgpu/types.h> |
26 | #include <nvgpu/io.h> | ||
26 | 27 | ||
27 | #include "gk20a/gk20a.h" | 28 | #include "gk20a/gk20a.h" |
28 | 29 | ||
diff --git a/drivers/gpu/nvgpu/gv100/mm_gv100.c b/drivers/gpu/nvgpu/gv100/mm_gv100.c index ffae11f5..38b876bf 100644 --- a/drivers/gpu/nvgpu/gv100/mm_gv100.c +++ b/drivers/gpu/nvgpu/gv100/mm_gv100.c | |||
@@ -1,7 +1,7 @@ | |||
1 | /* | 1 | /* |
2 | * GV100 memory management | 2 | * GV100 memory management |
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"), |
@@ -23,6 +23,7 @@ | |||
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include <nvgpu/sizes.h> | 25 | #include <nvgpu/sizes.h> |
26 | #include <nvgpu/io.h> | ||
26 | 27 | ||
27 | #include "gk20a/gk20a.h" | 28 | #include "gk20a/gk20a.h" |
28 | #include "gv100/mm_gv100.h" | 29 | #include "gv100/mm_gv100.h" |
diff --git a/drivers/gpu/nvgpu/gv100/nvlink_gv100.c b/drivers/gpu/nvgpu/gv100/nvlink_gv100.c index 41c2cd2b..add0448e 100644 --- a/drivers/gpu/nvgpu/gv100/nvlink_gv100.c +++ b/drivers/gpu/nvgpu/gv100/nvlink_gv100.c | |||
@@ -28,6 +28,7 @@ | |||
28 | #include <nvgpu/bitops.h> | 28 | #include <nvgpu/bitops.h> |
29 | #include <nvgpu/nvlink.h> | 29 | #include <nvgpu/nvlink.h> |
30 | #include <nvgpu/enabled.h> | 30 | #include <nvgpu/enabled.h> |
31 | #include <nvgpu/io.h> | ||
31 | 32 | ||
32 | #include "gk20a/gk20a.h" | 33 | #include "gk20a/gk20a.h" |
33 | #include "nvlink_gv100.h" | 34 | #include "nvlink_gv100.h" |
diff --git a/drivers/gpu/nvgpu/gv11b/acr_gv11b.c b/drivers/gpu/nvgpu/gv11b/acr_gv11b.c index 7fe3a2ea..696eb015 100644 --- a/drivers/gpu/nvgpu/gv11b/acr_gv11b.c +++ b/drivers/gpu/nvgpu/gv11b/acr_gv11b.c | |||
@@ -31,6 +31,7 @@ | |||
31 | #include <nvgpu/mm.h> | 31 | #include <nvgpu/mm.h> |
32 | #include <nvgpu/acr/nvgpu_acr.h> | 32 | #include <nvgpu/acr/nvgpu_acr.h> |
33 | #include <nvgpu/enabled.h> | 33 | #include <nvgpu/enabled.h> |
34 | #include <nvgpu/io.h> | ||
34 | 35 | ||
35 | #include "gk20a/gk20a.h" | 36 | #include "gk20a/gk20a.h" |
36 | #include "acr_gv11b.h" | 37 | #include "acr_gv11b.h" |
diff --git a/drivers/gpu/nvgpu/gv11b/ce_gv11b.c b/drivers/gpu/nvgpu/gv11b/ce_gv11b.c index 86518ac7..0183aff0 100644 --- a/drivers/gpu/nvgpu/gv11b/ce_gv11b.c +++ b/drivers/gpu/nvgpu/gv11b/ce_gv11b.c | |||
@@ -1,7 +1,7 @@ | |||
1 | /* | 1 | /* |
2 | * Volta GPU series Copy Engine. | 2 | * Volta GPU series Copy Engine. |
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,6 +22,7 @@ | |||
22 | * DEALINGS IN THE SOFTWARE. | 22 | * DEALINGS IN THE SOFTWARE. |
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include <nvgpu/io.h> | ||
25 | #include "nvgpu/log.h" | 26 | #include "nvgpu/log.h" |
26 | #include "nvgpu/bitops.h" | 27 | #include "nvgpu/bitops.h" |
27 | 28 | ||
diff --git a/drivers/gpu/nvgpu/gv11b/css_gr_gv11b.c b/drivers/gpu/nvgpu/gv11b/css_gr_gv11b.c index 7f03be64..4ab50244 100644 --- a/drivers/gpu/nvgpu/gv11b/css_gr_gv11b.c +++ b/drivers/gpu/nvgpu/gv11b/css_gr_gv11b.c | |||
@@ -33,6 +33,7 @@ | |||
33 | #include <nvgpu/nvgpu_mem.h> | 33 | #include <nvgpu/nvgpu_mem.h> |
34 | #include <nvgpu/bug.h> | 34 | #include <nvgpu/bug.h> |
35 | #include <nvgpu/dma.h> | 35 | #include <nvgpu/dma.h> |
36 | #include <nvgpu/io.h> | ||
36 | 37 | ||
37 | #include "gk20a/gk20a.h" | 38 | #include "gk20a/gk20a.h" |
38 | #include "gk20a/css_gr_gk20a.h" | 39 | #include "gk20a/css_gr_gk20a.h" |
diff --git a/drivers/gpu/nvgpu/gv11b/dbg_gpu_gv11b.c b/drivers/gpu/nvgpu/gv11b/dbg_gpu_gv11b.c index 5dea7654..0ab6d445 100644 --- a/drivers/gpu/nvgpu/gv11b/dbg_gpu_gv11b.c +++ b/drivers/gpu/nvgpu/gv11b/dbg_gpu_gv11b.c | |||
@@ -23,6 +23,7 @@ | |||
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include <nvgpu/log.h> | 25 | #include <nvgpu/log.h> |
26 | #include <nvgpu/io.h> | ||
26 | #include "gk20a/gk20a.h" | 27 | #include "gk20a/gk20a.h" |
27 | #include "gv11b/dbg_gpu_gv11b.h" | 28 | #include "gv11b/dbg_gpu_gv11b.h" |
28 | #include <nvgpu/hw/gv11b/hw_perf_gv11b.h> | 29 | #include <nvgpu/hw/gv11b/hw_perf_gv11b.h> |
diff --git a/drivers/gpu/nvgpu/gv11b/fifo_gv11b.c b/drivers/gpu/nvgpu/gv11b/fifo_gv11b.c index 548371d6..d1bd7111 100644 --- a/drivers/gpu/nvgpu/gv11b/fifo_gv11b.c +++ b/drivers/gpu/nvgpu/gv11b/fifo_gv11b.c | |||
@@ -37,6 +37,7 @@ | |||
37 | #include <nvgpu/ctxsw_trace.h> | 37 | #include <nvgpu/ctxsw_trace.h> |
38 | #include <nvgpu/io_usermode.h> | 38 | #include <nvgpu/io_usermode.h> |
39 | #include <nvgpu/ptimer.h> | 39 | #include <nvgpu/ptimer.h> |
40 | #include <nvgpu/io.h> | ||
40 | 41 | ||
41 | #include "gk20a/gk20a.h" | 42 | #include "gk20a/gk20a.h" |
42 | #include "gk20a/fifo_gk20a.h" | 43 | #include "gk20a/fifo_gk20a.h" |
diff --git a/drivers/gpu/nvgpu/gv11b/gr_gv11b.c b/drivers/gpu/nvgpu/gv11b/gr_gv11b.c index 51588f1f..2fd7b8ee 100644 --- a/drivers/gpu/nvgpu/gv11b/gr_gv11b.c +++ b/drivers/gpu/nvgpu/gv11b/gr_gv11b.c | |||
@@ -32,6 +32,7 @@ | |||
32 | #include <nvgpu/bug.h> | 32 | #include <nvgpu/bug.h> |
33 | #include <nvgpu/error_notifier.h> | 33 | #include <nvgpu/error_notifier.h> |
34 | #include <nvgpu/soc.h> | 34 | #include <nvgpu/soc.h> |
35 | #include <nvgpu/io.h> | ||
35 | 36 | ||
36 | #include "gk20a/gk20a.h" | 37 | #include "gk20a/gk20a.h" |
37 | #include "gk20a/gr_gk20a.h" | 38 | #include "gk20a/gr_gk20a.h" |
diff --git a/drivers/gpu/nvgpu/gv11b/ltc_gv11b.c b/drivers/gpu/nvgpu/gv11b/ltc_gv11b.c index a040de23..673f1493 100644 --- a/drivers/gpu/nvgpu/gv11b/ltc_gv11b.c +++ b/drivers/gpu/nvgpu/gv11b/ltc_gv11b.c | |||
@@ -22,6 +22,7 @@ | |||
22 | * DEALINGS IN THE SOFTWARE. | 22 | * DEALINGS IN THE SOFTWARE. |
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include <nvgpu/io.h> | ||
25 | #include "gk20a/gk20a.h" | 26 | #include "gk20a/gk20a.h" |
26 | #include "gp10b/ltc_gp10b.h" | 27 | #include "gp10b/ltc_gp10b.h" |
27 | 28 | ||
diff --git a/drivers/gpu/nvgpu/gv11b/mc_gv11b.c b/drivers/gpu/nvgpu/gv11b/mc_gv11b.c index bc802c2d..c8072d13 100644 --- a/drivers/gpu/nvgpu/gv11b/mc_gv11b.c +++ b/drivers/gpu/nvgpu/gv11b/mc_gv11b.c | |||
@@ -23,6 +23,7 @@ | |||
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include <nvgpu/types.h> | 25 | #include <nvgpu/types.h> |
26 | #include <nvgpu/io.h> | ||
26 | 27 | ||
27 | #include "gk20a/gk20a.h" | 28 | #include "gk20a/gk20a.h" |
28 | 29 | ||
diff --git a/drivers/gpu/nvgpu/gv11b/pmu_gv11b.c b/drivers/gpu/nvgpu/gv11b/pmu_gv11b.c index 9a2e9c00..d3d95439 100644 --- a/drivers/gpu/nvgpu/gv11b/pmu_gv11b.c +++ b/drivers/gpu/nvgpu/gv11b/pmu_gv11b.c | |||
@@ -26,6 +26,7 @@ | |||
26 | #include <nvgpu/falcon.h> | 26 | #include <nvgpu/falcon.h> |
27 | #include <nvgpu/enabled.h> | 27 | #include <nvgpu/enabled.h> |
28 | #include <nvgpu/mm.h> | 28 | #include <nvgpu/mm.h> |
29 | #include <nvgpu/io.h> | ||
29 | 30 | ||
30 | #include "gk20a/gk20a.h" | 31 | #include "gk20a/gk20a.h" |
31 | 32 | ||
diff --git a/drivers/gpu/nvgpu/gv11b/therm_gv11b.c b/drivers/gpu/nvgpu/gv11b/therm_gv11b.c index 981009ad..cce4e4a8 100644 --- a/drivers/gpu/nvgpu/gv11b/therm_gv11b.c +++ b/drivers/gpu/nvgpu/gv11b/therm_gv11b.c | |||
@@ -26,6 +26,7 @@ | |||
26 | #include "therm_gv11b.h" | 26 | #include "therm_gv11b.h" |
27 | 27 | ||
28 | #include <nvgpu/soc.h> | 28 | #include <nvgpu/soc.h> |
29 | #include <nvgpu/io.h> | ||
29 | 30 | ||
30 | #include <nvgpu/hw/gv11b/hw_therm_gv11b.h> | 31 | #include <nvgpu/hw/gv11b/hw_therm_gv11b.h> |
31 | 32 | ||
diff --git a/drivers/gpu/nvgpu/os/linux/debug_clk.c b/drivers/gpu/nvgpu/os/linux/debug_clk.c index 2484d44b..f514d2c8 100644 --- a/drivers/gpu/nvgpu/os/linux/debug_clk.c +++ b/drivers/gpu/nvgpu/os/linux/debug_clk.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 software is licensed under the terms of the GNU General Public | 4 | * This software is licensed under the terms of the GNU General Public |
5 | * License version 2, as published by the Free Software Foundation, and | 5 | * License version 2, as published by the Free Software Foundation, and |
@@ -16,6 +16,8 @@ | |||
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 <nvgpu/io.h> | ||
20 | |||
19 | #include "gm20b/clk_gm20b.h" | 21 | #include "gm20b/clk_gm20b.h" |
20 | #include "os_linux.h" | 22 | #include "os_linux.h" |
21 | #include "platform_gk20a.h" | 23 | #include "platform_gk20a.h" |
diff --git a/drivers/gpu/nvgpu/os/linux/sim_pci.c b/drivers/gpu/nvgpu/os/linux/sim_pci.c index d37767b7..8b192e28 100644 --- a/drivers/gpu/nvgpu/os/linux/sim_pci.c +++ b/drivers/gpu/nvgpu/os/linux/sim_pci.c | |||
@@ -25,6 +25,7 @@ | |||
25 | #include <nvgpu/dma.h> | 25 | #include <nvgpu/dma.h> |
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 "gk20a/gk20a.h" | 29 | #include "gk20a/gk20a.h" |
29 | #include "os_linux.h" | 30 | #include "os_linux.h" |
30 | #include "module.h" | 31 | #include "module.h" |
diff --git a/drivers/gpu/nvgpu/vgpu/fifo_vgpu.c b/drivers/gpu/nvgpu/vgpu/fifo_vgpu.c index b0388fae..98c7b9ce 100644 --- a/drivers/gpu/nvgpu/vgpu/fifo_vgpu.c +++ b/drivers/gpu/nvgpu/vgpu/fifo_vgpu.c | |||
@@ -29,6 +29,7 @@ | |||
29 | #include <nvgpu/atomic.h> | 29 | #include <nvgpu/atomic.h> |
30 | #include <nvgpu/bug.h> | 30 | #include <nvgpu/bug.h> |
31 | #include <nvgpu/barrier.h> | 31 | #include <nvgpu/barrier.h> |
32 | #include <nvgpu/io.h> | ||
32 | #include <nvgpu/error_notifier.h> | 33 | #include <nvgpu/error_notifier.h> |
33 | #include <nvgpu/vgpu/vgpu_ivc.h> | 34 | #include <nvgpu/vgpu/vgpu_ivc.h> |
34 | #include <nvgpu/vgpu/vgpu.h> | 35 | #include <nvgpu/vgpu/vgpu.h> |