diff options
Diffstat (limited to 'drivers')
37 files changed, 65 insertions, 63 deletions
diff --git a/drivers/gpu/nvgpu/gm20b/acr_gm20b.c b/drivers/gpu/nvgpu/gm20b/acr_gm20b.c index 24112dd3..be05a8a8 100644 --- a/drivers/gpu/nvgpu/gm20b/acr_gm20b.c +++ b/drivers/gpu/nvgpu/gm20b/acr_gm20b.c | |||
@@ -35,8 +35,8 @@ | |||
35 | #include <nvgpu/mm.h> | 35 | #include <nvgpu/mm.h> |
36 | #include <nvgpu/io.h> | 36 | #include <nvgpu/io.h> |
37 | #include <nvgpu/utils.h> | 37 | #include <nvgpu/utils.h> |
38 | #include <nvgpu/gk20a.h> | ||
38 | 39 | ||
39 | #include "gk20a/gk20a.h" | ||
40 | #include "mm_gm20b.h" | 40 | #include "mm_gm20b.h" |
41 | #include "acr_gm20b.h" | 41 | #include "acr_gm20b.h" |
42 | 42 | ||
diff --git a/drivers/gpu/nvgpu/gm20b/clk_gm20b.c b/drivers/gpu/nvgpu/gm20b/clk_gm20b.c index d2260d9c..31a14c0c 100644 --- a/drivers/gpu/nvgpu/gm20b/clk_gm20b.c +++ b/drivers/gpu/nvgpu/gm20b/clk_gm20b.c | |||
@@ -22,9 +22,6 @@ | |||
22 | * DEALINGS IN THE SOFTWARE. | 22 | * DEALINGS IN THE SOFTWARE. |
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include "gk20a/gk20a.h" | ||
26 | #include "clk_gm20b.h" | ||
27 | |||
28 | #include <nvgpu/soc.h> | 25 | #include <nvgpu/soc.h> |
29 | #include <nvgpu/fuse.h> | 26 | #include <nvgpu/fuse.h> |
30 | #include <nvgpu/bug.h> | 27 | #include <nvgpu/bug.h> |
@@ -33,6 +30,9 @@ | |||
33 | #include <nvgpu/io.h> | 30 | #include <nvgpu/io.h> |
34 | #include <nvgpu/utils.h> | 31 | #include <nvgpu/utils.h> |
35 | #include <nvgpu/timers.h> | 32 | #include <nvgpu/timers.h> |
33 | #include <nvgpu/gk20a.h> | ||
34 | |||
35 | #include "clk_gm20b.h" | ||
36 | 36 | ||
37 | #include <nvgpu/hw/gm20b/hw_trim_gm20b.h> | 37 | #include <nvgpu/hw/gm20b/hw_trim_gm20b.h> |
38 | #include <nvgpu/hw/gm20b/hw_therm_gm20b.h> | 38 | #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 19653541..f866b6bb 100644 --- a/drivers/gpu/nvgpu/gm20b/fifo_gm20b.c +++ b/drivers/gpu/nvgpu/gm20b/fifo_gm20b.c | |||
@@ -22,11 +22,6 @@ | |||
22 | * DEALINGS IN THE SOFTWARE. | 22 | * DEALINGS IN THE SOFTWARE. |
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include "gk20a/gk20a.h" | ||
26 | #include "gk20a/fifo_gk20a.h" | ||
27 | |||
28 | #include "fifo_gm20b.h" | ||
29 | |||
30 | #include <nvgpu/timers.h> | 25 | #include <nvgpu/timers.h> |
31 | #include <nvgpu/log.h> | 26 | #include <nvgpu/log.h> |
32 | #include <nvgpu/atomic.h> | 27 | #include <nvgpu/atomic.h> |
@@ -35,8 +30,13 @@ | |||
35 | #include <nvgpu/enabled.h> | 30 | #include <nvgpu/enabled.h> |
36 | #include <nvgpu/io.h> | 31 | #include <nvgpu/io.h> |
37 | #include <nvgpu/bug.h> | 32 | #include <nvgpu/bug.h> |
33 | #include <nvgpu/gk20a.h> | ||
38 | #include <nvgpu/channel.h> | 34 | #include <nvgpu/channel.h> |
39 | 35 | ||
36 | #include "gk20a/fifo_gk20a.h" | ||
37 | |||
38 | #include "fifo_gm20b.h" | ||
39 | |||
40 | #include <nvgpu/hw/gm20b/hw_ccsr_gm20b.h> | 40 | #include <nvgpu/hw/gm20b/hw_ccsr_gm20b.h> |
41 | #include <nvgpu/hw/gm20b/hw_ram_gm20b.h> | 41 | #include <nvgpu/hw/gm20b/hw_ram_gm20b.h> |
42 | #include <nvgpu/hw/gm20b/hw_fifo_gm20b.h> | 42 | #include <nvgpu/hw/gm20b/hw_fifo_gm20b.h> |
diff --git a/drivers/gpu/nvgpu/gm20b/gr_ctx_gm20b.c b/drivers/gpu/nvgpu/gm20b/gr_ctx_gm20b.c index cd7433b3..8c9c4c92 100644 --- a/drivers/gpu/nvgpu/gm20b/gr_ctx_gm20b.c +++ b/drivers/gpu/nvgpu/gm20b/gr_ctx_gm20b.c | |||
@@ -24,7 +24,8 @@ | |||
24 | * DEALINGS IN THE SOFTWARE. | 24 | * DEALINGS IN THE SOFTWARE. |
25 | */ | 25 | */ |
26 | 26 | ||
27 | #include "gk20a/gk20a.h" | 27 | #include <nvgpu/gk20a.h> |
28 | |||
28 | #include "gr_ctx_gm20b.h" | 29 | #include "gr_ctx_gm20b.h" |
29 | 30 | ||
30 | int gr_gm20b_get_netlist_name(struct gk20a *g, int index, char *name) | 31 | int gr_gm20b_get_netlist_name(struct gk20a *g, int index, char *name) |
diff --git a/drivers/gpu/nvgpu/gm20b/gr_gm20b.c b/drivers/gpu/nvgpu/gm20b/gr_gm20b.c index 32e98e53..200f58a3 100644 --- a/drivers/gpu/nvgpu/gm20b/gr_gm20b.c +++ b/drivers/gpu/nvgpu/gm20b/gr_gm20b.c | |||
@@ -29,9 +29,9 @@ | |||
29 | #include <nvgpu/fuse.h> | 29 | #include <nvgpu/fuse.h> |
30 | #include <nvgpu/io.h> | 30 | #include <nvgpu/io.h> |
31 | #include <nvgpu/utils.h> | 31 | #include <nvgpu/utils.h> |
32 | #include <nvgpu/gk20a.h> | ||
32 | #include <nvgpu/channel.h> | 33 | #include <nvgpu/channel.h> |
33 | 34 | ||
34 | #include "gk20a/gk20a.h" | ||
35 | #include "gk20a/gr_gk20a.h" | 35 | #include "gk20a/gr_gk20a.h" |
36 | 36 | ||
37 | #include "gr_gm20b.h" | 37 | #include "gr_gm20b.h" |
diff --git a/drivers/gpu/nvgpu/gm20b/hal_gm20b.c b/drivers/gpu/nvgpu/gm20b/hal_gm20b.c index f863aa72..772a4a85 100644 --- a/drivers/gpu/nvgpu/gm20b/hal_gm20b.c +++ b/drivers/gpu/nvgpu/gm20b/hal_gm20b.c | |||
@@ -21,6 +21,13 @@ | |||
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/debug.h> | ||
25 | #include <nvgpu/bug.h> | ||
26 | #include <nvgpu/enabled.h> | ||
27 | #include <nvgpu/ptimer.h> | ||
28 | #include <nvgpu/error_notifier.h> | ||
29 | #include <nvgpu/gk20a.h> | ||
30 | #include <nvgpu/channel.h> | ||
24 | 31 | ||
25 | #include "common/clock_gating/gm20b_gating_reglist.h" | 32 | #include "common/clock_gating/gm20b_gating_reglist.h" |
26 | #include "common/bus/bus_gm20b.h" | 33 | #include "common/bus/bus_gm20b.h" |
@@ -34,7 +41,6 @@ | |||
34 | #include "common/fuse/fuse_gm20b.h" | 41 | #include "common/fuse/fuse_gm20b.h" |
35 | #include "common/mc/mc_gm20b.h" | 42 | #include "common/mc/mc_gm20b.h" |
36 | 43 | ||
37 | #include "gk20a/gk20a.h" | ||
38 | #include "gk20a/ce2_gk20a.h" | 44 | #include "gk20a/ce2_gk20a.h" |
39 | #include "gk20a/dbg_gpu_gk20a.h" | 45 | #include "gk20a/dbg_gpu_gk20a.h" |
40 | #include "gk20a/fifo_gk20a.h" | 46 | #include "gk20a/fifo_gk20a.h" |
@@ -56,13 +62,6 @@ | |||
56 | #include "hal_gm20b.h" | 62 | #include "hal_gm20b.h" |
57 | #include "acr_gm20b.h" | 63 | #include "acr_gm20b.h" |
58 | 64 | ||
59 | #include <nvgpu/debug.h> | ||
60 | #include <nvgpu/bug.h> | ||
61 | #include <nvgpu/enabled.h> | ||
62 | #include <nvgpu/ptimer.h> | ||
63 | #include <nvgpu/error_notifier.h> | ||
64 | #include <nvgpu/channel.h> | ||
65 | |||
66 | #include <nvgpu/hw/gm20b/hw_proj_gm20b.h> | 65 | #include <nvgpu/hw/gm20b/hw_proj_gm20b.h> |
67 | #include <nvgpu/hw/gm20b/hw_fifo_gm20b.h> | 66 | #include <nvgpu/hw/gm20b/hw_fifo_gm20b.h> |
68 | #include <nvgpu/hw/gm20b/hw_ram_gm20b.h> | 67 | #include <nvgpu/hw/gm20b/hw_ram_gm20b.h> |
diff --git a/drivers/gpu/nvgpu/gm20b/mm_gm20b.c b/drivers/gpu/nvgpu/gm20b/mm_gm20b.c index dbaaacc5..23dec6c0 100644 --- a/drivers/gpu/nvgpu/gm20b/mm_gm20b.c +++ b/drivers/gpu/nvgpu/gm20b/mm_gm20b.c | |||
@@ -23,8 +23,7 @@ | |||
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include <nvgpu/sizes.h> | 25 | #include <nvgpu/sizes.h> |
26 | 26 | #include <nvgpu/gk20a.h> | |
27 | #include "gk20a/gk20a.h" | ||
28 | 27 | ||
29 | #include "mm_gm20b.h" | 28 | #include "mm_gm20b.h" |
30 | 29 | ||
diff --git a/drivers/gpu/nvgpu/gm20b/pmu_gm20b.c b/drivers/gpu/nvgpu/gm20b/pmu_gm20b.c index a46f8807..c1ec4d8e 100644 --- a/drivers/gpu/nvgpu/gm20b/pmu_gm20b.c +++ b/drivers/gpu/nvgpu/gm20b/pmu_gm20b.c | |||
@@ -27,8 +27,8 @@ | |||
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 | #include <nvgpu/io.h> |
30 | #include <nvgpu/gk20a.h> | ||
30 | 31 | ||
31 | #include "gk20a/gk20a.h" | ||
32 | #include "gk20a/pmu_gk20a.h" | 32 | #include "gk20a/pmu_gk20a.h" |
33 | 33 | ||
34 | #include "acr_gm20b.h" | 34 | #include "acr_gm20b.h" |
diff --git a/drivers/gpu/nvgpu/gm20b/regops_gm20b.c b/drivers/gpu/nvgpu/gm20b/regops_gm20b.c index ab865b68..2a74ab73 100644 --- a/drivers/gpu/nvgpu/gm20b/regops_gm20b.c +++ b/drivers/gpu/nvgpu/gm20b/regops_gm20b.c | |||
@@ -22,7 +22,8 @@ | |||
22 | * DEALINGS IN THE SOFTWARE. | 22 | * DEALINGS IN THE SOFTWARE. |
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include "gk20a/gk20a.h" | 25 | #include <nvgpu/gk20a.h> |
26 | |||
26 | #include "gk20a/regops_gk20a.h" | 27 | #include "gk20a/regops_gk20a.h" |
27 | #include "regops_gm20b.h" | 28 | #include "regops_gm20b.h" |
28 | 29 | ||
diff --git a/drivers/gpu/nvgpu/gp10b/ce_gp10b.c b/drivers/gpu/nvgpu/gp10b/ce_gp10b.c index 0c07c069..1800ac81 100644 --- a/drivers/gpu/nvgpu/gp10b/ce_gp10b.c +++ b/drivers/gpu/nvgpu/gp10b/ce_gp10b.c | |||
@@ -23,7 +23,7 @@ | |||
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include <nvgpu/io.h> | 25 | #include <nvgpu/io.h> |
26 | #include "gk20a/gk20a.h" | 26 | #include <nvgpu/gk20a.h> |
27 | 27 | ||
28 | #include "ce_gp10b.h" | 28 | #include "ce_gp10b.h" |
29 | 29 | ||
diff --git a/drivers/gpu/nvgpu/gp10b/ecc_gp10b.c b/drivers/gpu/nvgpu/gp10b/ecc_gp10b.c index cf95c0d7..7c7218c2 100644 --- a/drivers/gpu/nvgpu/gp10b/ecc_gp10b.c +++ b/drivers/gpu/nvgpu/gp10b/ecc_gp10b.c | |||
@@ -21,8 +21,8 @@ | |||
21 | */ | 21 | */ |
22 | 22 | ||
23 | #include <nvgpu/ecc.h> | 23 | #include <nvgpu/ecc.h> |
24 | #include <nvgpu/gk20a.h> | ||
24 | 25 | ||
25 | #include "gk20a/gk20a.h" | ||
26 | #include "gp10b/ecc_gp10b.h" | 26 | #include "gp10b/ecc_gp10b.h" |
27 | 27 | ||
28 | int gp10b_ecc_init(struct gk20a *g) | 28 | int gp10b_ecc_init(struct gk20a *g) |
diff --git a/drivers/gpu/nvgpu/gp10b/fecs_trace_gp10b.c b/drivers/gpu/nvgpu/gp10b/fecs_trace_gp10b.c index c477c77d..3dc672ff 100644 --- a/drivers/gpu/nvgpu/gp10b/fecs_trace_gp10b.c +++ b/drivers/gpu/nvgpu/gp10b/fecs_trace_gp10b.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/fecs_trace_gk20a.h" | 27 | #include "gk20a/fecs_trace_gk20a.h" |
27 | 28 | ||
28 | #include "fecs_trace_gp10b.h" | 29 | #include "fecs_trace_gp10b.h" |
diff --git a/drivers/gpu/nvgpu/gp10b/fifo_gp10b.c b/drivers/gpu/nvgpu/gp10b/fifo_gp10b.c index 7bf6e769..21fed4fc 100644 --- a/drivers/gpu/nvgpu/gp10b/fifo_gp10b.c +++ b/drivers/gpu/nvgpu/gp10b/fifo_gp10b.c | |||
@@ -28,11 +28,11 @@ | |||
28 | #include <nvgpu/enabled.h> | 28 | #include <nvgpu/enabled.h> |
29 | #include <nvgpu/io.h> | 29 | #include <nvgpu/io.h> |
30 | #include <nvgpu/utils.h> | 30 | #include <nvgpu/utils.h> |
31 | #include <nvgpu/gk20a.h> | ||
31 | #include <nvgpu/channel.h> | 32 | #include <nvgpu/channel.h> |
32 | 33 | ||
33 | #include "fifo_gp10b.h" | 34 | #include "fifo_gp10b.h" |
34 | 35 | ||
35 | #include "gk20a/gk20a.h" | ||
36 | #include "gm20b/fifo_gm20b.h" | 36 | #include "gm20b/fifo_gm20b.h" |
37 | #include "gk20a/channel_sync_gk20a.h" | 37 | #include "gk20a/channel_sync_gk20a.h" |
38 | 38 | ||
diff --git a/drivers/gpu/nvgpu/gp10b/gp10b.c b/drivers/gpu/nvgpu/gp10b/gp10b.c index 6e09b860..773fb619 100644 --- a/drivers/gpu/nvgpu/gp10b/gp10b.c +++ b/drivers/gpu/nvgpu/gp10b/gp10b.c | |||
@@ -22,8 +22,7 @@ | |||
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 | |||
27 | #include <nvgpu/enabled.h> | 26 | #include <nvgpu/enabled.h> |
28 | #include <nvgpu/io.h> | 27 | #include <nvgpu/io.h> |
29 | 28 | ||
diff --git a/drivers/gpu/nvgpu/gp10b/gp10b.h b/drivers/gpu/nvgpu/gp10b/gp10b.h index cd850a07..61ad1e2b 100644 --- a/drivers/gpu/nvgpu/gp10b/gp10b.h +++ b/drivers/gpu/nvgpu/gp10b/gp10b.h | |||
@@ -25,7 +25,7 @@ | |||
25 | #ifndef GP10B_H | 25 | #ifndef GP10B_H |
26 | #define GP10B_H | 26 | #define GP10B_H |
27 | 27 | ||
28 | #include "gk20a/gk20a.h" | 28 | #include <nvgpu/gk20a.h> |
29 | 29 | ||
30 | int gp10b_init_gpu_characteristics(struct gk20a *g); | 30 | int gp10b_init_gpu_characteristics(struct gk20a *g); |
31 | 31 | ||
diff --git a/drivers/gpu/nvgpu/gp10b/gr_ctx_gp10b.c b/drivers/gpu/nvgpu/gp10b/gr_ctx_gp10b.c index cf51e8b4..a06eca58 100644 --- a/drivers/gpu/nvgpu/gp10b/gr_ctx_gp10b.c +++ b/drivers/gpu/nvgpu/gp10b/gr_ctx_gp10b.c | |||
@@ -24,7 +24,8 @@ | |||
24 | * DEALINGS IN THE SOFTWARE. | 24 | * DEALINGS IN THE SOFTWARE. |
25 | */ | 25 | */ |
26 | 26 | ||
27 | #include "gk20a/gk20a.h" | 27 | #include <nvgpu/gk20a.h> |
28 | |||
28 | #include "gr_ctx_gp10b.h" | 29 | #include "gr_ctx_gp10b.h" |
29 | 30 | ||
30 | int gr_gp10b_get_netlist_name(struct gk20a *g, int index, char *name) | 31 | int gr_gp10b_get_netlist_name(struct gk20a *g, int index, char *name) |
diff --git a/drivers/gpu/nvgpu/gp10b/gr_gp10b.c b/drivers/gpu/nvgpu/gp10b/gr_gp10b.c index db6f5618..913434ab 100644 --- a/drivers/gpu/nvgpu/gp10b/gr_gp10b.c +++ b/drivers/gpu/nvgpu/gp10b/gr_gp10b.c | |||
@@ -32,9 +32,9 @@ | |||
32 | #include <nvgpu/enabled.h> | 32 | #include <nvgpu/enabled.h> |
33 | #include <nvgpu/io.h> | 33 | #include <nvgpu/io.h> |
34 | #include <nvgpu/utils.h> | 34 | #include <nvgpu/utils.h> |
35 | #include <nvgpu/gk20a.h> | ||
35 | #include <nvgpu/channel.h> | 36 | #include <nvgpu/channel.h> |
36 | 37 | ||
37 | #include "gk20a/gk20a.h" | ||
38 | #include "gk20a/gr_gk20a.h" | 38 | #include "gk20a/gr_gk20a.h" |
39 | #include "gk20a/dbg_gpu_gk20a.h" | 39 | #include "gk20a/dbg_gpu_gk20a.h" |
40 | #include "gk20a/regops_gk20a.h" | 40 | #include "gk20a/regops_gk20a.h" |
diff --git a/drivers/gpu/nvgpu/gp10b/hal_gp10b.c b/drivers/gpu/nvgpu/gp10b/hal_gp10b.c index 9430595b..a524a551 100644 --- a/drivers/gpu/nvgpu/gp10b/hal_gp10b.c +++ b/drivers/gpu/nvgpu/gp10b/hal_gp10b.c | |||
@@ -21,6 +21,14 @@ | |||
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/debug.h> | ||
25 | #include <nvgpu/bug.h> | ||
26 | #include <nvgpu/enabled.h> | ||
27 | #include <nvgpu/ptimer.h> | ||
28 | #include <nvgpu/ctxsw_trace.h> | ||
29 | #include <nvgpu/error_notifier.h> | ||
30 | #include <nvgpu/gk20a.h> | ||
31 | #include <nvgpu/channel.h> | ||
24 | 32 | ||
25 | #include "common/bus/bus_gk20a.h" | 33 | #include "common/bus/bus_gk20a.h" |
26 | #include "common/clock_gating/gp10b_gating_reglist.h" | 34 | #include "common/clock_gating/gp10b_gating_reglist.h" |
@@ -40,7 +48,6 @@ | |||
40 | #include "common/mc/mc_gm20b.h" | 48 | #include "common/mc/mc_gm20b.h" |
41 | #include "common/mc/mc_gp10b.h" | 49 | #include "common/mc/mc_gp10b.h" |
42 | 50 | ||
43 | #include "gk20a/gk20a.h" | ||
44 | #include "gk20a/fifo_gk20a.h" | 51 | #include "gk20a/fifo_gk20a.h" |
45 | #include "gk20a/fecs_trace_gk20a.h" | 52 | #include "gk20a/fecs_trace_gk20a.h" |
46 | #include "gk20a/mm_gk20a.h" | 53 | #include "gk20a/mm_gk20a.h" |
@@ -72,14 +79,6 @@ | |||
72 | #include "gp10b.h" | 79 | #include "gp10b.h" |
73 | #include "hal_gp10b.h" | 80 | #include "hal_gp10b.h" |
74 | 81 | ||
75 | #include <nvgpu/debug.h> | ||
76 | #include <nvgpu/bug.h> | ||
77 | #include <nvgpu/enabled.h> | ||
78 | #include <nvgpu/ptimer.h> | ||
79 | #include <nvgpu/ctxsw_trace.h> | ||
80 | #include <nvgpu/error_notifier.h> | ||
81 | #include <nvgpu/channel.h> | ||
82 | |||
83 | #include <nvgpu/hw/gp10b/hw_proj_gp10b.h> | 82 | #include <nvgpu/hw/gp10b/hw_proj_gp10b.h> |
84 | #include <nvgpu/hw/gp10b/hw_fifo_gp10b.h> | 83 | #include <nvgpu/hw/gp10b/hw_fifo_gp10b.h> |
85 | #include <nvgpu/hw/gp10b/hw_ram_gp10b.h> | 84 | #include <nvgpu/hw/gp10b/hw_ram_gp10b.h> |
diff --git a/drivers/gpu/nvgpu/gp10b/mm_gp10b.c b/drivers/gpu/nvgpu/gp10b/mm_gp10b.c index c8f71a19..2c0056e1 100644 --- a/drivers/gpu/nvgpu/gp10b/mm_gp10b.c +++ b/drivers/gpu/nvgpu/gp10b/mm_gp10b.c | |||
@@ -27,8 +27,8 @@ | |||
27 | #include <nvgpu/gmmu.h> | 27 | #include <nvgpu/gmmu.h> |
28 | #include <nvgpu/sizes.h> | 28 | #include <nvgpu/sizes.h> |
29 | #include <nvgpu/utils.h> | 29 | #include <nvgpu/utils.h> |
30 | #include <nvgpu/gk20a.h> | ||
30 | 31 | ||
31 | #include "gk20a/gk20a.h" | ||
32 | #include "gm20b/mm_gm20b.h" | 32 | #include "gm20b/mm_gm20b.h" |
33 | #include "mm_gp10b.h" | 33 | #include "mm_gp10b.h" |
34 | 34 | ||
diff --git a/drivers/gpu/nvgpu/gp10b/pmu_gp10b.c b/drivers/gpu/nvgpu/gp10b/pmu_gp10b.c index 32e7297f..5c7d1523 100644 --- a/drivers/gpu/nvgpu/gp10b/pmu_gp10b.c +++ b/drivers/gpu/nvgpu/gp10b/pmu_gp10b.c | |||
@@ -27,8 +27,8 @@ | |||
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 | #include <nvgpu/io.h> |
30 | #include <nvgpu/gk20a.h> | ||
30 | 31 | ||
31 | #include "gk20a/gk20a.h" | ||
32 | #include "gk20a/pmu_gk20a.h" | 32 | #include "gk20a/pmu_gk20a.h" |
33 | #include "gm20b/acr_gm20b.h" | 33 | #include "gm20b/acr_gm20b.h" |
34 | #include "gm20b/pmu_gm20b.h" | 34 | #include "gm20b/pmu_gm20b.h" |
diff --git a/drivers/gpu/nvgpu/gp10b/regops_gp10b.c b/drivers/gpu/nvgpu/gp10b/regops_gp10b.c index c61709e0..43551988 100644 --- a/drivers/gpu/nvgpu/gp10b/regops_gp10b.c +++ b/drivers/gpu/nvgpu/gp10b/regops_gp10b.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_gp10b.h" | 28 | #include "regops_gp10b.h" |
28 | 29 | ||
diff --git a/drivers/gpu/nvgpu/gv11b/acr_gv11b.c b/drivers/gpu/nvgpu/gv11b/acr_gv11b.c index e27c1760..c7b854bf 100644 --- a/drivers/gpu/nvgpu/gv11b/acr_gv11b.c +++ b/drivers/gpu/nvgpu/gv11b/acr_gv11b.c | |||
@@ -33,8 +33,8 @@ | |||
33 | #include <nvgpu/enabled.h> | 33 | #include <nvgpu/enabled.h> |
34 | #include <nvgpu/io.h> | 34 | #include <nvgpu/io.h> |
35 | #include <nvgpu/utils.h> | 35 | #include <nvgpu/utils.h> |
36 | #include <nvgpu/gk20a.h> | ||
36 | 37 | ||
37 | #include "gk20a/gk20a.h" | ||
38 | #include "acr_gv11b.h" | 38 | #include "acr_gv11b.h" |
39 | #include "pmu_gv11b.h" | 39 | #include "pmu_gv11b.h" |
40 | #include "gm20b/mm_gm20b.h" | 40 | #include "gm20b/mm_gm20b.h" |
diff --git a/drivers/gpu/nvgpu/gv11b/ce_gv11b.c b/drivers/gpu/nvgpu/gv11b/ce_gv11b.c index 0183aff0..2eea11df 100644 --- a/drivers/gpu/nvgpu/gv11b/ce_gv11b.c +++ b/drivers/gpu/nvgpu/gv11b/ce_gv11b.c | |||
@@ -25,8 +25,7 @@ | |||
25 | #include <nvgpu/io.h> | 25 | #include <nvgpu/io.h> |
26 | #include "nvgpu/log.h" | 26 | #include "nvgpu/log.h" |
27 | #include "nvgpu/bitops.h" | 27 | #include "nvgpu/bitops.h" |
28 | 28 | #include <nvgpu/gk20a.h> | |
29 | #include "gk20a/gk20a.h" | ||
30 | 29 | ||
31 | #include "gp10b/ce_gp10b.h" | 30 | #include "gp10b/ce_gp10b.h" |
32 | 31 | ||
diff --git a/drivers/gpu/nvgpu/gv11b/css_gr_gv11b.c b/drivers/gpu/nvgpu/gv11b/css_gr_gv11b.c index 4707ab31..1191dad3 100644 --- a/drivers/gpu/nvgpu/gv11b/css_gr_gv11b.c +++ b/drivers/gpu/nvgpu/gv11b/css_gr_gv11b.c | |||
@@ -35,9 +35,9 @@ | |||
35 | #include <nvgpu/dma.h> | 35 | #include <nvgpu/dma.h> |
36 | #include <nvgpu/io.h> | 36 | #include <nvgpu/io.h> |
37 | #include <nvgpu/utils.h> | 37 | #include <nvgpu/utils.h> |
38 | #include <nvgpu/gk20a.h> | ||
38 | #include <nvgpu/channel.h> | 39 | #include <nvgpu/channel.h> |
39 | 40 | ||
40 | #include "gk20a/gk20a.h" | ||
41 | #include "gk20a/css_gr_gk20a.h" | 41 | #include "gk20a/css_gr_gk20a.h" |
42 | #include "css_gr_gv11b.h" | 42 | #include "css_gr_gv11b.h" |
43 | 43 | ||
diff --git a/drivers/gpu/nvgpu/gv11b/dbg_gpu_gv11b.c b/drivers/gpu/nvgpu/gv11b/dbg_gpu_gv11b.c index 85db7aea..ec6cce55 100644 --- a/drivers/gpu/nvgpu/gv11b/dbg_gpu_gv11b.c +++ b/drivers/gpu/nvgpu/gv11b/dbg_gpu_gv11b.c | |||
@@ -25,8 +25,8 @@ | |||
25 | #include <nvgpu/log.h> | 25 | #include <nvgpu/log.h> |
26 | #include <nvgpu/io.h> | 26 | #include <nvgpu/io.h> |
27 | #include <nvgpu/utils.h> | 27 | #include <nvgpu/utils.h> |
28 | #include <nvgpu/gk20a.h> | ||
28 | 29 | ||
29 | #include "gk20a/gk20a.h" | ||
30 | #include "gv11b/dbg_gpu_gv11b.h" | 30 | #include "gv11b/dbg_gpu_gv11b.h" |
31 | #include <nvgpu/hw/gv11b/hw_perf_gv11b.h> | 31 | #include <nvgpu/hw/gv11b/hw_perf_gv11b.h> |
32 | #include <nvgpu/hw/gv11b/hw_mc_gv11b.h> | 32 | #include <nvgpu/hw/gv11b/hw_mc_gv11b.h> |
diff --git a/drivers/gpu/nvgpu/gv11b/ecc_gv11b.c b/drivers/gpu/nvgpu/gv11b/ecc_gv11b.c index 6e29bf94..07937042 100644 --- a/drivers/gpu/nvgpu/gv11b/ecc_gv11b.c +++ b/drivers/gpu/nvgpu/gv11b/ecc_gv11b.c | |||
@@ -21,8 +21,8 @@ | |||
21 | */ | 21 | */ |
22 | 22 | ||
23 | #include <nvgpu/ecc.h> | 23 | #include <nvgpu/ecc.h> |
24 | #include <nvgpu/gk20a.h> | ||
24 | 25 | ||
25 | #include "gk20a/gk20a.h" | ||
26 | #include "gv11b/ecc_gv11b.h" | 26 | #include "gv11b/ecc_gv11b.h" |
27 | 27 | ||
28 | int gv11b_ecc_init(struct gk20a *g) | 28 | int gv11b_ecc_init(struct gk20a *g) |
diff --git a/drivers/gpu/nvgpu/gv11b/fifo_gv11b.c b/drivers/gpu/nvgpu/gv11b/fifo_gv11b.c index 4632d3f8..fa1836c8 100644 --- a/drivers/gpu/nvgpu/gv11b/fifo_gv11b.c +++ b/drivers/gpu/nvgpu/gv11b/fifo_gv11b.c | |||
@@ -39,9 +39,9 @@ | |||
39 | #include <nvgpu/ptimer.h> | 39 | #include <nvgpu/ptimer.h> |
40 | #include <nvgpu/io.h> | 40 | #include <nvgpu/io.h> |
41 | #include <nvgpu/utils.h> | 41 | #include <nvgpu/utils.h> |
42 | #include <nvgpu/gk20a.h> | ||
42 | #include <nvgpu/channel.h> | 43 | #include <nvgpu/channel.h> |
43 | 44 | ||
44 | #include "gk20a/gk20a.h" | ||
45 | #include "gk20a/fifo_gk20a.h" | 45 | #include "gk20a/fifo_gk20a.h" |
46 | 46 | ||
47 | #include "gp10b/fifo_gp10b.h" | 47 | #include "gp10b/fifo_gp10b.h" |
diff --git a/drivers/gpu/nvgpu/gv11b/gr_ctx_gv11b.c b/drivers/gpu/nvgpu/gv11b/gr_ctx_gv11b.c index 514aadb1..9ac54192 100644 --- a/drivers/gpu/nvgpu/gv11b/gr_ctx_gv11b.c +++ b/drivers/gpu/nvgpu/gv11b/gr_ctx_gv11b.c | |||
@@ -23,7 +23,7 @@ | |||
23 | * DEALINGS IN THE SOFTWARE. | 23 | * DEALINGS IN THE SOFTWARE. |
24 | */ | 24 | */ |
25 | 25 | ||
26 | #include "gk20a/gk20a.h" | 26 | #include <nvgpu/gk20a.h> |
27 | 27 | ||
28 | #include "gr_ctx_gv11b.h" | 28 | #include "gr_ctx_gv11b.h" |
29 | 29 | ||
diff --git a/drivers/gpu/nvgpu/gv11b/gr_gv11b.c b/drivers/gpu/nvgpu/gv11b/gr_gv11b.c index 2596d400..78cb1b98 100644 --- a/drivers/gpu/nvgpu/gv11b/gr_gv11b.c +++ b/drivers/gpu/nvgpu/gv11b/gr_gv11b.c | |||
@@ -35,9 +35,9 @@ | |||
35 | #include <nvgpu/io.h> | 35 | #include <nvgpu/io.h> |
36 | #include <nvgpu/utils.h> | 36 | #include <nvgpu/utils.h> |
37 | #include <nvgpu/bitops.h> | 37 | #include <nvgpu/bitops.h> |
38 | #include <nvgpu/gk20a.h> | ||
38 | #include <nvgpu/channel.h> | 39 | #include <nvgpu/channel.h> |
39 | 40 | ||
40 | #include "gk20a/gk20a.h" | ||
41 | #include "gk20a/gr_gk20a.h" | 41 | #include "gk20a/gr_gk20a.h" |
42 | #include "gk20a/dbg_gpu_gk20a.h" | 42 | #include "gk20a/dbg_gpu_gk20a.h" |
43 | #include "gk20a/regops_gk20a.h" | 43 | #include "gk20a/regops_gk20a.h" |
diff --git a/drivers/gpu/nvgpu/gv11b/gv11b.c b/drivers/gpu/nvgpu/gv11b/gv11b.c index 5d2bfbd7..db146095 100644 --- a/drivers/gpu/nvgpu/gv11b/gv11b.c +++ b/drivers/gpu/nvgpu/gv11b/gv11b.c | |||
@@ -23,8 +23,8 @@ | |||
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include <nvgpu/enabled.h> | 25 | #include <nvgpu/enabled.h> |
26 | #include <nvgpu/gk20a.h> | ||
26 | 27 | ||
27 | #include "gk20a/gk20a.h" | ||
28 | #include "gv11b/gv11b.h" | 28 | #include "gv11b/gv11b.h" |
29 | 29 | ||
30 | int gv11b_init_gpu_characteristics(struct gk20a *g) | 30 | int gv11b_init_gpu_characteristics(struct gk20a *g) |
diff --git a/drivers/gpu/nvgpu/gv11b/gv11b.h b/drivers/gpu/nvgpu/gv11b/gv11b.h index 3d5490e6..c6ecf141 100644 --- a/drivers/gpu/nvgpu/gv11b/gv11b.h +++ b/drivers/gpu/nvgpu/gv11b/gv11b.h | |||
@@ -25,7 +25,7 @@ | |||
25 | #ifndef GV11B_H | 25 | #ifndef GV11B_H |
26 | #define GV11B_H | 26 | #define GV11B_H |
27 | 27 | ||
28 | #include "gk20a/gk20a.h" | 28 | #include <nvgpu/gk20a.h> |
29 | 29 | ||
30 | int gv11b_init_gpu_characteristics(struct gk20a *g); | 30 | int gv11b_init_gpu_characteristics(struct gk20a *g); |
31 | 31 | ||
diff --git a/drivers/gpu/nvgpu/gv11b/hal_gv11b.c b/drivers/gpu/nvgpu/gv11b/hal_gv11b.c index 91122fba..479b06d1 100644 --- a/drivers/gpu/nvgpu/gv11b/hal_gv11b.c +++ b/drivers/gpu/nvgpu/gv11b/hal_gv11b.c | |||
@@ -21,6 +21,7 @@ | |||
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 "common/bus/bus_gk20a.h" | 26 | #include "common/bus/bus_gk20a.h" |
26 | #include "common/bus/bus_gp10b.h" | 27 | #include "common/bus/bus_gp10b.h" |
@@ -44,7 +45,6 @@ | |||
44 | #include "common/mc/mc_gp10b.h" | 45 | #include "common/mc/mc_gp10b.h" |
45 | #include "common/mc/mc_gv11b.h" | 46 | #include "common/mc/mc_gv11b.h" |
46 | 47 | ||
47 | #include "gk20a/gk20a.h" | ||
48 | #include "gk20a/fifo_gk20a.h" | 48 | #include "gk20a/fifo_gk20a.h" |
49 | #include "gk20a/fecs_trace_gk20a.h" | 49 | #include "gk20a/fecs_trace_gk20a.h" |
50 | #include "gk20a/css_gr_gk20a.h" | 50 | #include "gk20a/css_gr_gk20a.h" |
diff --git a/drivers/gpu/nvgpu/gv11b/mm_gv11b.c b/drivers/gpu/nvgpu/gv11b/mm_gv11b.c index 5d5aed94..8027d165 100644 --- a/drivers/gpu/nvgpu/gv11b/mm_gv11b.c +++ b/drivers/gpu/nvgpu/gv11b/mm_gv11b.c | |||
@@ -27,8 +27,8 @@ | |||
27 | #include <nvgpu/log.h> | 27 | #include <nvgpu/log.h> |
28 | #include <nvgpu/mm.h> | 28 | #include <nvgpu/mm.h> |
29 | #include <nvgpu/enabled.h> | 29 | #include <nvgpu/enabled.h> |
30 | #include <nvgpu/gk20a.h> | ||
30 | 31 | ||
31 | #include "gk20a/gk20a.h" | ||
32 | #include "gk20a/mm_gk20a.h" | 32 | #include "gk20a/mm_gk20a.h" |
33 | 33 | ||
34 | #include "gp10b/mm_gp10b.h" | 34 | #include "gp10b/mm_gp10b.h" |
diff --git a/drivers/gpu/nvgpu/gv11b/pmu_gv11b.c b/drivers/gpu/nvgpu/gv11b/pmu_gv11b.c index 60ffdb98..a9f183b1 100644 --- a/drivers/gpu/nvgpu/gv11b/pmu_gv11b.c +++ b/drivers/gpu/nvgpu/gv11b/pmu_gv11b.c | |||
@@ -28,8 +28,7 @@ | |||
28 | #include <nvgpu/mm.h> | 28 | #include <nvgpu/mm.h> |
29 | #include <nvgpu/io.h> | 29 | #include <nvgpu/io.h> |
30 | #include <nvgpu/utils.h> | 30 | #include <nvgpu/utils.h> |
31 | 31 | #include <nvgpu/gk20a.h> | |
32 | #include "gk20a/gk20a.h" | ||
33 | 32 | ||
34 | #include "gp10b/pmu_gp10b.h" | 33 | #include "gp10b/pmu_gp10b.h" |
35 | #include "gp106/pmu_gp106.h" | 34 | #include "gp106/pmu_gp106.h" |
diff --git a/drivers/gpu/nvgpu/gv11b/regops_gv11b.c b/drivers/gpu/nvgpu/gv11b/regops_gv11b.c index 0bc8ab05..13386a4a 100644 --- a/drivers/gpu/nvgpu/gv11b/regops_gv11b.c +++ b/drivers/gpu/nvgpu/gv11b/regops_gv11b.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_gv11b.h" | 28 | #include "regops_gv11b.h" |
28 | 29 | ||
diff --git a/drivers/gpu/nvgpu/gv11b/subctx_gv11b.c b/drivers/gpu/nvgpu/gv11b/subctx_gv11b.c index 25626cd4..499a00a8 100644 --- a/drivers/gpu/nvgpu/gv11b/subctx_gv11b.c +++ b/drivers/gpu/nvgpu/gv11b/subctx_gv11b.c | |||
@@ -22,9 +22,7 @@ | |||
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 | |||
27 | #include "gv11b/subctx_gv11b.h" | ||
28 | 26 | ||
29 | #include <nvgpu/dma.h> | 27 | #include <nvgpu/dma.h> |
30 | #include <nvgpu/log.h> | 28 | #include <nvgpu/log.h> |
@@ -36,6 +34,8 @@ | |||
36 | #include <nvgpu/hw/gv11b/hw_ctxsw_prog_gv11b.h> | 34 | #include <nvgpu/hw/gv11b/hw_ctxsw_prog_gv11b.h> |
37 | #include <nvgpu/hw/gv11b/hw_gr_gv11b.h> | 35 | #include <nvgpu/hw/gv11b/hw_gr_gv11b.h> |
38 | 36 | ||
37 | #include "gv11b/subctx_gv11b.h" | ||
38 | |||
39 | static void gv11b_subctx_commit_valid_mask(struct vm_gk20a *vm, | 39 | static void gv11b_subctx_commit_valid_mask(struct vm_gk20a *vm, |
40 | struct nvgpu_mem *inst_block); | 40 | struct nvgpu_mem *inst_block); |
41 | static void gv11b_subctx_commit_pdb(struct vm_gk20a *vm, | 41 | static void gv11b_subctx_commit_pdb(struct vm_gk20a *vm, |
diff --git a/drivers/gpu/nvgpu/include/nvgpu/debug.h b/drivers/gpu/nvgpu/include/nvgpu/debug.h index 900850c3..33bf6215 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/debug.h +++ b/drivers/gpu/nvgpu/include/nvgpu/debug.h | |||
@@ -25,6 +25,8 @@ | |||
25 | #ifndef NVGPU_DEBUG_H | 25 | #ifndef NVGPU_DEBUG_H |
26 | #define NVGPU_DEBUG_H | 26 | #define NVGPU_DEBUG_H |
27 | 27 | ||
28 | #include <nvgpu/types.h> | ||
29 | |||
28 | struct gk20a; | 30 | struct gk20a; |
29 | struct gpu_ops; | 31 | struct gpu_ops; |
30 | 32 | ||