diff options
Diffstat (limited to 'drivers/gpu/nvgpu/vgpu')
-rw-r--r-- | drivers/gpu/nvgpu/vgpu/css_vgpu.c | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/vgpu/dbg_vgpu.c | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/vgpu/fifo_vgpu.c | 1 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/vgpu/gp10b/vgpu_gr_gp10b.c | 1 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/vgpu/gp10b/vgpu_hal_gp10b.c | 1 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/vgpu/gr_vgpu.c | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/vgpu/gv11b/vgpu_fifo_gv11b.c | 1 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/vgpu/gv11b/vgpu_hal_gv11b.c | 1 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/vgpu/gv11b/vgpu_subctx_gv11b.c | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/vgpu/gv11b/vgpu_tsg_gv11b.c | 1 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/vgpu/mm_vgpu.c | 1 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/vgpu/tsg_vgpu.c | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/vgpu/vgpu.c | 1 |
13 files changed, 14 insertions, 4 deletions
diff --git a/drivers/gpu/nvgpu/vgpu/css_vgpu.c b/drivers/gpu/nvgpu/vgpu/css_vgpu.c index 40ff8f90..1c97d03a 100644 --- a/drivers/gpu/nvgpu/vgpu/css_vgpu.c +++ b/drivers/gpu/nvgpu/vgpu/css_vgpu.c | |||
@@ -26,9 +26,9 @@ | |||
26 | #include <nvgpu/vgpu/tegra_vgpu.h> | 26 | #include <nvgpu/vgpu/tegra_vgpu.h> |
27 | #include <nvgpu/dt.h> | 27 | #include <nvgpu/dt.h> |
28 | #include <nvgpu/bug.h> | 28 | #include <nvgpu/bug.h> |
29 | #include <nvgpu/channel.h> | ||
29 | 30 | ||
30 | #include "gk20a/gk20a.h" | 31 | #include "gk20a/gk20a.h" |
31 | #include "gk20a/channel_gk20a.h" | ||
32 | #include "gk20a/css_gr_gk20a.h" | 32 | #include "gk20a/css_gr_gk20a.h" |
33 | 33 | ||
34 | #include "vgpu/css_vgpu.h" | 34 | #include "vgpu/css_vgpu.h" |
diff --git a/drivers/gpu/nvgpu/vgpu/dbg_vgpu.c b/drivers/gpu/nvgpu/vgpu/dbg_vgpu.c index 2bb3b205..d188f540 100644 --- a/drivers/gpu/nvgpu/vgpu/dbg_vgpu.c +++ b/drivers/gpu/nvgpu/vgpu/dbg_vgpu.c | |||
@@ -24,9 +24,9 @@ | |||
24 | #include <nvgpu/vgpu/tegra_vgpu.h> | 24 | #include <nvgpu/vgpu/tegra_vgpu.h> |
25 | #include <nvgpu/vgpu/vgpu.h> | 25 | #include <nvgpu/vgpu/vgpu.h> |
26 | #include <nvgpu/bug.h> | 26 | #include <nvgpu/bug.h> |
27 | #include <nvgpu/channel.h> | ||
27 | 28 | ||
28 | #include "gk20a/gk20a.h" | 29 | #include "gk20a/gk20a.h" |
29 | #include "gk20a/channel_gk20a.h" | ||
30 | #include "gk20a/dbg_gpu_gk20a.h" | 30 | #include "gk20a/dbg_gpu_gk20a.h" |
31 | #include "gk20a/regops_gk20a.h" | 31 | #include "gk20a/regops_gk20a.h" |
32 | #include "dbg_vgpu.h" | 32 | #include "dbg_vgpu.h" |
diff --git a/drivers/gpu/nvgpu/vgpu/fifo_vgpu.c b/drivers/gpu/nvgpu/vgpu/fifo_vgpu.c index 98c7b9ce..aa5abec9 100644 --- a/drivers/gpu/nvgpu/vgpu/fifo_vgpu.c +++ b/drivers/gpu/nvgpu/vgpu/fifo_vgpu.c | |||
@@ -33,6 +33,7 @@ | |||
33 | #include <nvgpu/error_notifier.h> | 33 | #include <nvgpu/error_notifier.h> |
34 | #include <nvgpu/vgpu/vgpu_ivc.h> | 34 | #include <nvgpu/vgpu/vgpu_ivc.h> |
35 | #include <nvgpu/vgpu/vgpu.h> | 35 | #include <nvgpu/vgpu/vgpu.h> |
36 | #include <nvgpu/channel.h> | ||
36 | 37 | ||
37 | #include "gk20a/gk20a.h" | 38 | #include "gk20a/gk20a.h" |
38 | #include "fifo_vgpu.h" | 39 | #include "fifo_vgpu.h" |
diff --git a/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_gr_gp10b.c b/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_gr_gp10b.c index 86184336..8110902f 100644 --- a/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_gr_gp10b.c +++ b/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_gr_gp10b.c | |||
@@ -24,6 +24,7 @@ | |||
24 | #include <nvgpu/dma.h> | 24 | #include <nvgpu/dma.h> |
25 | #include <nvgpu/bug.h> | 25 | #include <nvgpu/bug.h> |
26 | #include <nvgpu/vgpu/vgpu.h> | 26 | #include <nvgpu/vgpu/vgpu.h> |
27 | #include <nvgpu/channel.h> | ||
27 | 28 | ||
28 | #include "vgpu/gm20b/vgpu_gr_gm20b.h" | 29 | #include "vgpu/gm20b/vgpu_gr_gm20b.h" |
29 | 30 | ||
diff --git a/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_hal_gp10b.c b/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_hal_gp10b.c index 7500e92e..0b6a5cb5 100644 --- a/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_hal_gp10b.c +++ b/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_hal_gp10b.c | |||
@@ -71,6 +71,7 @@ | |||
71 | #include <nvgpu/enabled.h> | 71 | #include <nvgpu/enabled.h> |
72 | #include <nvgpu/vgpu/vgpu.h> | 72 | #include <nvgpu/vgpu/vgpu.h> |
73 | #include <nvgpu/error_notifier.h> | 73 | #include <nvgpu/error_notifier.h> |
74 | #include <nvgpu/channel.h> | ||
74 | 75 | ||
75 | #include <nvgpu/hw/gp10b/hw_fifo_gp10b.h> | 76 | #include <nvgpu/hw/gp10b/hw_fifo_gp10b.h> |
76 | #include <nvgpu/hw/gp10b/hw_ram_gp10b.h> | 77 | #include <nvgpu/hw/gp10b/hw_ram_gp10b.h> |
diff --git a/drivers/gpu/nvgpu/vgpu/gr_vgpu.c b/drivers/gpu/nvgpu/vgpu/gr_vgpu.c index 9ee57fb4..4b1cf212 100644 --- a/drivers/gpu/nvgpu/vgpu/gr_vgpu.c +++ b/drivers/gpu/nvgpu/vgpu/gr_vgpu.c | |||
@@ -29,11 +29,11 @@ | |||
29 | #include <nvgpu/dma.h> | 29 | #include <nvgpu/dma.h> |
30 | #include <nvgpu/vgpu/vgpu_ivc.h> | 30 | #include <nvgpu/vgpu/vgpu_ivc.h> |
31 | #include <nvgpu/vgpu/vgpu.h> | 31 | #include <nvgpu/vgpu/vgpu.h> |
32 | #include <nvgpu/channel.h> | ||
32 | 33 | ||
33 | #include "gr_vgpu.h" | 34 | #include "gr_vgpu.h" |
34 | #include "gk20a/gk20a.h" | 35 | #include "gk20a/gk20a.h" |
35 | #include "gk20a/dbg_gpu_gk20a.h" | 36 | #include "gk20a/dbg_gpu_gk20a.h" |
36 | #include "gk20a/channel_gk20a.h" | ||
37 | #include "gk20a/tsg_gk20a.h" | 37 | #include "gk20a/tsg_gk20a.h" |
38 | #include "gk20a/fecs_trace_gk20a.h" | 38 | #include "gk20a/fecs_trace_gk20a.h" |
39 | 39 | ||
diff --git a/drivers/gpu/nvgpu/vgpu/gv11b/vgpu_fifo_gv11b.c b/drivers/gpu/nvgpu/vgpu/gv11b/vgpu_fifo_gv11b.c index 43cff1c0..3042ad12 100644 --- a/drivers/gpu/nvgpu/vgpu/gv11b/vgpu_fifo_gv11b.c +++ b/drivers/gpu/nvgpu/vgpu/gv11b/vgpu_fifo_gv11b.c | |||
@@ -25,6 +25,7 @@ | |||
25 | #include <nvgpu/vgpu/vgpu.h> | 25 | #include <nvgpu/vgpu/vgpu.h> |
26 | #include <nvgpu/nvhost.h> | 26 | #include <nvgpu/nvhost.h> |
27 | #include <nvgpu/vgpu/tegra_vgpu.h> | 27 | #include <nvgpu/vgpu/tegra_vgpu.h> |
28 | #include <nvgpu/channel.h> | ||
28 | 29 | ||
29 | #include "gv11b/fifo_gv11b.h" | 30 | #include "gv11b/fifo_gv11b.h" |
30 | #include "vgpu_fifo_gv11b.h" | 31 | #include "vgpu_fifo_gv11b.h" |
diff --git a/drivers/gpu/nvgpu/vgpu/gv11b/vgpu_hal_gv11b.c b/drivers/gpu/nvgpu/vgpu/gv11b/vgpu_hal_gv11b.c index fb118f16..85835cee 100644 --- a/drivers/gpu/nvgpu/vgpu/gv11b/vgpu_hal_gv11b.c +++ b/drivers/gpu/nvgpu/vgpu/gv11b/vgpu_hal_gv11b.c | |||
@@ -85,6 +85,7 @@ | |||
85 | #include <gv11b/gr_gv11b.h> | 85 | #include <gv11b/gr_gv11b.h> |
86 | 86 | ||
87 | #include <nvgpu/enabled.h> | 87 | #include <nvgpu/enabled.h> |
88 | #include <nvgpu/channel.h> | ||
88 | 89 | ||
89 | #include "vgpu_gv11b.h" | 90 | #include "vgpu_gv11b.h" |
90 | #include "vgpu_gr_gv11b.h" | 91 | #include "vgpu_gr_gv11b.h" |
diff --git a/drivers/gpu/nvgpu/vgpu/gv11b/vgpu_subctx_gv11b.c b/drivers/gpu/nvgpu/vgpu/gv11b/vgpu_subctx_gv11b.c index b5272ae1..14d10847 100644 --- a/drivers/gpu/nvgpu/vgpu/gv11b/vgpu_subctx_gv11b.c +++ b/drivers/gpu/nvgpu/vgpu/gv11b/vgpu_subctx_gv11b.c | |||
@@ -25,6 +25,8 @@ | |||
25 | 25 | ||
26 | #include <nvgpu/vgpu/vgpu.h> | 26 | #include <nvgpu/vgpu/vgpu.h> |
27 | #include <nvgpu/vgpu/tegra_vgpu.h> | 27 | #include <nvgpu/vgpu/tegra_vgpu.h> |
28 | #include <nvgpu/channel.h> | ||
29 | |||
28 | #include <nvgpu/hw/gv11b/hw_ctxsw_prog_gv11b.h> | 30 | #include <nvgpu/hw/gv11b/hw_ctxsw_prog_gv11b.h> |
29 | 31 | ||
30 | int vgpu_gv11b_alloc_subctx_header(struct channel_gk20a *c) | 32 | int vgpu_gv11b_alloc_subctx_header(struct channel_gk20a *c) |
diff --git a/drivers/gpu/nvgpu/vgpu/gv11b/vgpu_tsg_gv11b.c b/drivers/gpu/nvgpu/vgpu/gv11b/vgpu_tsg_gv11b.c index e42bea1f..8c999161 100644 --- a/drivers/gpu/nvgpu/vgpu/gv11b/vgpu_tsg_gv11b.c +++ b/drivers/gpu/nvgpu/vgpu/gv11b/vgpu_tsg_gv11b.c | |||
@@ -22,6 +22,7 @@ | |||
22 | 22 | ||
23 | #include <nvgpu/vgpu/tegra_vgpu.h> | 23 | #include <nvgpu/vgpu/tegra_vgpu.h> |
24 | #include <nvgpu/vgpu/vgpu.h> | 24 | #include <nvgpu/vgpu/vgpu.h> |
25 | #include <nvgpu/channel.h> | ||
25 | 26 | ||
26 | #include "gk20a/gk20a.h" | 27 | #include "gk20a/gk20a.h" |
27 | #include "vgpu_tsg_gv11b.h" | 28 | #include "vgpu_tsg_gv11b.h" |
diff --git a/drivers/gpu/nvgpu/vgpu/mm_vgpu.c b/drivers/gpu/nvgpu/vgpu/mm_vgpu.c index 229a9767..837508bb 100644 --- a/drivers/gpu/nvgpu/vgpu/mm_vgpu.c +++ b/drivers/gpu/nvgpu/vgpu/mm_vgpu.c | |||
@@ -27,6 +27,7 @@ | |||
27 | #include <nvgpu/bug.h> | 27 | #include <nvgpu/bug.h> |
28 | #include <nvgpu/vm.h> | 28 | #include <nvgpu/vm.h> |
29 | #include <nvgpu/vm_area.h> | 29 | #include <nvgpu/vm_area.h> |
30 | #include <nvgpu/channel.h> | ||
30 | 31 | ||
31 | #include <nvgpu/vgpu/vm.h> | 32 | #include <nvgpu/vgpu/vm.h> |
32 | #include <nvgpu/vgpu/vgpu.h> | 33 | #include <nvgpu/vgpu/vgpu.h> |
diff --git a/drivers/gpu/nvgpu/vgpu/tsg_vgpu.c b/drivers/gpu/nvgpu/vgpu/tsg_vgpu.c index 7bb8f671..a81b5022 100644 --- a/drivers/gpu/nvgpu/vgpu/tsg_vgpu.c +++ b/drivers/gpu/nvgpu/vgpu/tsg_vgpu.c | |||
@@ -21,9 +21,9 @@ | |||
21 | */ | 21 | */ |
22 | 22 | ||
23 | #include "gk20a/gk20a.h" | 23 | #include "gk20a/gk20a.h" |
24 | #include "gk20a/channel_gk20a.h" | ||
25 | #include "gk20a/tsg_gk20a.h" | 24 | #include "gk20a/tsg_gk20a.h" |
26 | #include "fifo_vgpu.h" | 25 | #include "fifo_vgpu.h" |
26 | #include <nvgpu/channel.h> | ||
27 | 27 | ||
28 | #include <nvgpu/bug.h> | 28 | #include <nvgpu/bug.h> |
29 | #include <nvgpu/vgpu/tegra_vgpu.h> | 29 | #include <nvgpu/vgpu/tegra_vgpu.h> |
diff --git a/drivers/gpu/nvgpu/vgpu/vgpu.c b/drivers/gpu/nvgpu/vgpu/vgpu.c index 8e20e4fc..bcd352e7 100644 --- a/drivers/gpu/nvgpu/vgpu/vgpu.c +++ b/drivers/gpu/nvgpu/vgpu/vgpu.c | |||
@@ -25,6 +25,7 @@ | |||
25 | #include <nvgpu/vgpu/vgpu_ivc.h> | 25 | #include <nvgpu/vgpu/vgpu_ivc.h> |
26 | #include <nvgpu/vgpu/vgpu.h> | 26 | #include <nvgpu/vgpu/vgpu.h> |
27 | #include <nvgpu/timers.h> | 27 | #include <nvgpu/timers.h> |
28 | #include <nvgpu/channel.h> | ||
28 | 29 | ||
29 | #include "gk20a/gk20a.h" | 30 | #include "gk20a/gk20a.h" |
30 | #include "fecs_trace_vgpu.h" | 31 | #include "fecs_trace_vgpu.h" |