diff options
-rw-r--r-- | drivers/gpu/nvgpu/Makefile | 14 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/Makefile.sources | 12 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/common/fb/fb_gk20a.c (renamed from drivers/gpu/nvgpu/gk20a/fb_gk20a.c) | 3 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/common/fb/fb_gk20a.h (renamed from drivers/gpu/nvgpu/gk20a/fb_gk20a.h) | 0 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/common/fb/fb_gm20b.c (renamed from drivers/gpu/nvgpu/gm20b/fb_gm20b.c) | 5 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/common/fb/fb_gm20b.h (renamed from drivers/gpu/nvgpu/gm20b/fb_gm20b.h) | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/common/fb/fb_gp106.c (renamed from drivers/gpu/nvgpu/gp106/fb_gp106.c) | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/common/fb/fb_gp106.h (renamed from drivers/gpu/nvgpu/gp106/fb_gp106.h) | 0 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/common/fb/fb_gp10b.c (renamed from drivers/gpu/nvgpu/gp10b/fb_gp10b.c) | 0 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/common/fb/fb_gp10b.h (renamed from drivers/gpu/nvgpu/gp10b/fb_gp10b.h) | 0 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/common/fb/fb_gv100.c (renamed from drivers/gpu/nvgpu/gv100/fb_gv100.c) | 3 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/common/fb/fb_gv100.h (renamed from drivers/gpu/nvgpu/gv100/fb_gv100.h) | 0 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/common/fb/fb_gv11b.c (renamed from drivers/gpu/nvgpu/gv11b/fb_gv11b.c) | 8 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/common/fb/fb_gv11b.h (renamed from drivers/gpu/nvgpu/gv11b/fb_gv11b.h) | 1 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gm20b/hal_gm20b.c | 4 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gp106/hal_gp106.c | 8 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gp10b/hal_gp10b.c | 6 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gv100/hal_gv100.c | 10 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gv100/mc_gv100.c | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gv11b/hal_gv11b.c | 8 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gv11b/mc_gv11b.c | 1 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/vgpu/gp10b/vgpu_hal_gp10b.c | 6 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/vgpu/gv11b/vgpu_hal_gv11b.c | 8 |
23 files changed, 53 insertions, 50 deletions
diff --git a/drivers/gpu/nvgpu/Makefile b/drivers/gpu/nvgpu/Makefile index 9ca762a3..e715e385 100644 --- a/drivers/gpu/nvgpu/Makefile +++ b/drivers/gpu/nvgpu/Makefile | |||
@@ -28,7 +28,13 @@ nvgpu-y += common/bus/bus_gk20a.o \ | |||
28 | common/bus/bus_gp10b.o \ | 28 | common/bus/bus_gp10b.o \ |
29 | common/bus/bus_gv100.o \ | 29 | common/bus/bus_gv100.o \ |
30 | common/ptimer/ptimer.o \ | 30 | common/ptimer/ptimer.o \ |
31 | common/ptimer/ptimer_gk20a.o | 31 | common/ptimer/ptimer_gk20a.o \ |
32 | common/fb/fb_gk20a.o \ | ||
33 | common/fb/fb_gm20b.o \ | ||
34 | common/fb/fb_gp10b.o \ | ||
35 | common/fb/fb_gp106.o \ | ||
36 | common/fb/fb_gv11b.o \ | ||
37 | common/fb/fb_gv100.o | ||
32 | 38 | ||
33 | # Linux specific parts of nvgpu. | 39 | # Linux specific parts of nvgpu. |
34 | nvgpu-y += \ | 40 | nvgpu-y += \ |
@@ -194,7 +200,6 @@ nvgpu-y += \ | |||
194 | gk20a/therm_gk20a.o \ | 200 | gk20a/therm_gk20a.o \ |
195 | gk20a/gr_ctx_gk20a_sim.o \ | 201 | gk20a/gr_ctx_gk20a_sim.o \ |
196 | gk20a/gr_ctx_gk20a.o \ | 202 | gk20a/gr_ctx_gk20a.o \ |
197 | gk20a/fb_gk20a.o \ | ||
198 | gk20a/hal.o \ | 203 | gk20a/hal.o \ |
199 | gk20a/tsg_gk20a.o \ | 204 | gk20a/tsg_gk20a.o \ |
200 | gk20a/fecs_trace_gk20a.o \ | 205 | gk20a/fecs_trace_gk20a.o \ |
@@ -203,7 +208,6 @@ nvgpu-y += \ | |||
203 | gm20b/ltc_gm20b.o \ | 208 | gm20b/ltc_gm20b.o \ |
204 | gm20b/gr_gm20b.o \ | 209 | gm20b/gr_gm20b.o \ |
205 | gm20b/clk_gm20b.o \ | 210 | gm20b/clk_gm20b.o \ |
206 | gm20b/fb_gm20b.o \ | ||
207 | gm20b/fifo_gm20b.o \ | 211 | gm20b/fifo_gm20b.o \ |
208 | gm20b/gr_ctx_gm20b.o \ | 212 | gm20b/gr_ctx_gm20b.o \ |
209 | gm20b/acr_gm20b.o \ | 213 | gm20b/acr_gm20b.o \ |
@@ -254,7 +258,6 @@ nvgpu-y += \ | |||
254 | gp10b/fifo_gp10b.o \ | 258 | gp10b/fifo_gp10b.o \ |
255 | gp10b/ltc_gp10b.o \ | 259 | gp10b/ltc_gp10b.o \ |
256 | gp10b/mm_gp10b.o \ | 260 | gp10b/mm_gp10b.o \ |
257 | gp10b/fb_gp10b.o \ | ||
258 | gp10b/pmu_gp10b.o \ | 261 | gp10b/pmu_gp10b.o \ |
259 | gp10b/hal_gp10b.o \ | 262 | gp10b/hal_gp10b.o \ |
260 | gp10b/regops_gp10b.o \ | 263 | gp10b/regops_gp10b.o \ |
@@ -273,7 +276,6 @@ nvgpu-y += \ | |||
273 | gp106/acr_gp106.o \ | 276 | gp106/acr_gp106.o \ |
274 | gp106/sec2_gp106.o \ | 277 | gp106/sec2_gp106.o \ |
275 | gp106/fifo_gp106.o \ | 278 | gp106/fifo_gp106.o \ |
276 | gp106/fb_gp106.o \ | ||
277 | gp106/regops_gp106.o \ | 279 | gp106/regops_gp106.o \ |
278 | gp106/bios_gp106.o \ | 280 | gp106/bios_gp106.o \ |
279 | gp106/fuse_gp106.o \ | 281 | gp106/fuse_gp106.o \ |
@@ -284,7 +286,6 @@ nvgpu-y += \ | |||
284 | gv11b/ltc_gv11b.o \ | 286 | gv11b/ltc_gv11b.o \ |
285 | gv11b/hal_gv11b.o \ | 287 | gv11b/hal_gv11b.o \ |
286 | gv11b/gr_gv11b.o \ | 288 | gv11b/gr_gv11b.o \ |
287 | gv11b/fb_gv11b.o \ | ||
288 | gv11b/fifo_gv11b.o \ | 289 | gv11b/fifo_gv11b.o \ |
289 | gv11b/mm_gv11b.o \ | 290 | gv11b/mm_gv11b.o \ |
290 | gv11b/ce_gv11b.o \ | 291 | gv11b/ce_gv11b.o \ |
@@ -296,7 +297,6 @@ nvgpu-y += \ | |||
296 | gv11b/therm_gv11b.o \ | 297 | gv11b/therm_gv11b.o \ |
297 | gv100/mm_gv100.o \ | 298 | gv100/mm_gv100.o \ |
298 | gv100/gr_ctx_gv100.o \ | 299 | gv100/gr_ctx_gv100.o \ |
299 | gv100/fb_gv100.o \ | ||
300 | gv100/bios_gv100.o \ | 300 | gv100/bios_gv100.o \ |
301 | gv100/fifo_gv100.o \ | 301 | gv100/fifo_gv100.o \ |
302 | gv100/gr_gv100.o \ | 302 | gv100/gr_gv100.o \ |
diff --git a/drivers/gpu/nvgpu/Makefile.sources b/drivers/gpu/nvgpu/Makefile.sources index 6fa815ab..c0340545 100644 --- a/drivers/gpu/nvgpu/Makefile.sources +++ b/drivers/gpu/nvgpu/Makefile.sources | |||
@@ -36,6 +36,12 @@ srcs := common/mm/nvgpu_allocator.c \ | |||
36 | common/bus/bus_gm20b.c \ | 36 | common/bus/bus_gm20b.c \ |
37 | common/bus/bus_gp10b.c \ | 37 | common/bus/bus_gp10b.c \ |
38 | common/bus/bus_gv100.c \ | 38 | common/bus/bus_gv100.c \ |
39 | common/fb/fb_gk20a.c \ | ||
40 | common/fb/fb_gm20b.c \ | ||
41 | common/fb/fb_gp10b.c \ | ||
42 | common/fb/fb_gp106.c \ | ||
43 | common/fb/fb_gv100.c \ | ||
44 | common/fb/fb_gv11b.c \ | ||
39 | common/enabled.c \ | 45 | common/enabled.c \ |
40 | common/pramin.c \ | 46 | common/pramin.c \ |
41 | common/semaphore.c \ | 47 | common/semaphore.c \ |
@@ -129,7 +135,6 @@ srcs := common/mm/nvgpu_allocator.c \ | |||
129 | gk20a/therm_gk20a.c \ | 135 | gk20a/therm_gk20a.c \ |
130 | gk20a/gr_ctx_gk20a_sim.c \ | 136 | gk20a/gr_ctx_gk20a_sim.c \ |
131 | gk20a/gr_ctx_gk20a.c \ | 137 | gk20a/gr_ctx_gk20a.c \ |
132 | gk20a/fb_gk20a.c \ | ||
133 | gk20a/hal.c \ | 138 | gk20a/hal.c \ |
134 | gk20a/tsg_gk20a.c \ | 139 | gk20a/tsg_gk20a.c \ |
135 | gk20a/mc_gk20a.c \ | 140 | gk20a/mc_gk20a.c \ |
@@ -137,7 +142,6 @@ srcs := common/mm/nvgpu_allocator.c \ | |||
137 | gm20b/ltc_gm20b.c \ | 142 | gm20b/ltc_gm20b.c \ |
138 | gm20b/gr_gm20b.c \ | 143 | gm20b/gr_gm20b.c \ |
139 | gm20b/clk_gm20b.c \ | 144 | gm20b/clk_gm20b.c \ |
140 | gm20b/fb_gm20b.c \ | ||
141 | gm20b/fifo_gm20b.c \ | 145 | gm20b/fifo_gm20b.c \ |
142 | gm20b/gr_ctx_gm20b.c \ | 146 | gm20b/gr_ctx_gm20b.c \ |
143 | gm20b/acr_gm20b.c \ | 147 | gm20b/acr_gm20b.c \ |
@@ -153,7 +157,6 @@ srcs := common/mm/nvgpu_allocator.c \ | |||
153 | gp10b/fifo_gp10b.c \ | 157 | gp10b/fifo_gp10b.c \ |
154 | gp10b/ltc_gp10b.c \ | 158 | gp10b/ltc_gp10b.c \ |
155 | gp10b/mm_gp10b.c \ | 159 | gp10b/mm_gp10b.c \ |
156 | gp10b/fb_gp10b.c \ | ||
157 | gp10b/pmu_gp10b.c \ | 160 | gp10b/pmu_gp10b.c \ |
158 | gp10b/hal_gp10b.c \ | 161 | gp10b/hal_gp10b.c \ |
159 | gp10b/regops_gp10b.c \ | 162 | gp10b/regops_gp10b.c \ |
@@ -168,7 +171,6 @@ srcs := common/mm/nvgpu_allocator.c \ | |||
168 | gv11b/ltc_gv11b.c \ | 171 | gv11b/ltc_gv11b.c \ |
169 | gv11b/hal_gv11b.c \ | 172 | gv11b/hal_gv11b.c \ |
170 | gv11b/gr_gv11b.c \ | 173 | gv11b/gr_gv11b.c \ |
171 | gv11b/fb_gv11b.c \ | ||
172 | gv11b/fifo_gv11b.c \ | 174 | gv11b/fifo_gv11b.c \ |
173 | gv11b/mm_gv11b.c \ | 175 | gv11b/mm_gv11b.c \ |
174 | gv11b/ce_gv11b.c \ | 176 | gv11b/ce_gv11b.c \ |
@@ -188,7 +190,6 @@ srcs := common/mm/nvgpu_allocator.c \ | |||
188 | gp106/acr_gp106.c \ | 190 | gp106/acr_gp106.c \ |
189 | gp106/sec2_gp106.c \ | 191 | gp106/sec2_gp106.c \ |
190 | gp106/fifo_gp106.c \ | 192 | gp106/fifo_gp106.c \ |
191 | gp106/fb_gp106.c \ | ||
192 | gp106/regops_gp106.c \ | 193 | gp106/regops_gp106.c \ |
193 | gp106/bios_gp106.c \ | 194 | gp106/bios_gp106.c \ |
194 | gp106/fuse_gp106.c \ | 195 | gp106/fuse_gp106.c \ |
@@ -198,7 +199,6 @@ srcs := common/mm/nvgpu_allocator.c \ | |||
198 | gp106/therm_gp106.c \ | 199 | gp106/therm_gp106.c \ |
199 | gv100/mm_gv100.c \ | 200 | gv100/mm_gv100.c \ |
200 | gv100/gr_ctx_gv100.c \ | 201 | gv100/gr_ctx_gv100.c \ |
201 | gv100/fb_gv100.c \ | ||
202 | gv100/bios_gv100.c \ | 202 | gv100/bios_gv100.c \ |
203 | gv100/fifo_gv100.c \ | 203 | gv100/fifo_gv100.c \ |
204 | gv100/gr_gv100.c \ | 204 | gv100/gr_gv100.c \ |
diff --git a/drivers/gpu/nvgpu/gk20a/fb_gk20a.c b/drivers/gpu/nvgpu/common/fb/fb_gk20a.c index c4be3313..d27ac9d0 100644 --- a/drivers/gpu/nvgpu/gk20a/fb_gk20a.c +++ b/drivers/gpu/nvgpu/common/fb/fb_gk20a.c | |||
@@ -24,7 +24,8 @@ | |||
24 | 24 | ||
25 | #include <trace/events/gk20a.h> | 25 | #include <trace/events/gk20a.h> |
26 | 26 | ||
27 | #include "gk20a.h" | 27 | #include "gk20a/gk20a.h" |
28 | |||
28 | #include "fb_gk20a.h" | 29 | #include "fb_gk20a.h" |
29 | 30 | ||
30 | #include <nvgpu/timers.h> | 31 | #include <nvgpu/timers.h> |
diff --git a/drivers/gpu/nvgpu/gk20a/fb_gk20a.h b/drivers/gpu/nvgpu/common/fb/fb_gk20a.h index 072c9027..072c9027 100644 --- a/drivers/gpu/nvgpu/gk20a/fb_gk20a.h +++ b/drivers/gpu/nvgpu/common/fb/fb_gk20a.h | |||
diff --git a/drivers/gpu/nvgpu/gm20b/fb_gm20b.c b/drivers/gpu/nvgpu/common/fb/fb_gm20b.c index 37a7944b..bd093b31 100644 --- a/drivers/gpu/nvgpu/gm20b/fb_gm20b.c +++ b/drivers/gpu/nvgpu/common/fb/fb_gm20b.c | |||
@@ -25,8 +25,9 @@ | |||
25 | #include <nvgpu/sizes.h> | 25 | #include <nvgpu/sizes.h> |
26 | 26 | ||
27 | #include "gk20a/gk20a.h" | 27 | #include "gk20a/gk20a.h" |
28 | #include "gk20a/fb_gk20a.h" | 28 | |
29 | #include "gm20b/fb_gm20b.h" | 29 | #include "fb_gk20a.h" |
30 | #include "fb_gm20b.h" | ||
30 | 31 | ||
31 | #include <nvgpu/hw/gm20b/hw_fb_gm20b.h> | 32 | #include <nvgpu/hw/gm20b/hw_fb_gm20b.h> |
32 | #include <nvgpu/hw/gm20b/hw_top_gm20b.h> | 33 | #include <nvgpu/hw/gm20b/hw_top_gm20b.h> |
diff --git a/drivers/gpu/nvgpu/gm20b/fb_gm20b.h b/drivers/gpu/nvgpu/common/fb/fb_gm20b.h index 1a5e9187..eb868b01 100644 --- a/drivers/gpu/nvgpu/gm20b/fb_gm20b.h +++ b/drivers/gpu/nvgpu/common/fb/fb_gm20b.h | |||
@@ -24,7 +24,9 @@ | |||
24 | 24 | ||
25 | #ifndef _NVHOST_GM20B_FB | 25 | #ifndef _NVHOST_GM20B_FB |
26 | #define _NVHOST_GM20B_FB | 26 | #define _NVHOST_GM20B_FB |
27 | |||
27 | struct gk20a; | 28 | struct gk20a; |
29 | struct wpr_carveout_info; | ||
28 | 30 | ||
29 | void fb_gm20b_init_fs_state(struct gk20a *g); | 31 | void fb_gm20b_init_fs_state(struct gk20a *g); |
30 | void gm20b_fb_set_mmu_page_size(struct gk20a *g); | 32 | void gm20b_fb_set_mmu_page_size(struct gk20a *g); |
diff --git a/drivers/gpu/nvgpu/gp106/fb_gp106.c b/drivers/gpu/nvgpu/common/fb/fb_gp106.c index 2bf97f61..6f257db4 100644 --- a/drivers/gpu/nvgpu/gp106/fb_gp106.c +++ b/drivers/gpu/nvgpu/common/fb/fb_gp106.c | |||
@@ -21,8 +21,8 @@ | |||
21 | */ | 21 | */ |
22 | 22 | ||
23 | #include "gk20a/gk20a.h" | 23 | #include "gk20a/gk20a.h" |
24 | #include "gp10b/fb_gp10b.h" | ||
25 | 24 | ||
25 | #include "fb_gp10b.h" | ||
26 | #include "fb_gp106.h" | 26 | #include "fb_gp106.h" |
27 | 27 | ||
28 | #include <nvgpu/hw/gp106/hw_fb_gp106.h> | 28 | #include <nvgpu/hw/gp106/hw_fb_gp106.h> |
diff --git a/drivers/gpu/nvgpu/gp106/fb_gp106.h b/drivers/gpu/nvgpu/common/fb/fb_gp106.h index d5ee87f4..d5ee87f4 100644 --- a/drivers/gpu/nvgpu/gp106/fb_gp106.h +++ b/drivers/gpu/nvgpu/common/fb/fb_gp106.h | |||
diff --git a/drivers/gpu/nvgpu/gp10b/fb_gp10b.c b/drivers/gpu/nvgpu/common/fb/fb_gp10b.c index 45fc8373..45fc8373 100644 --- a/drivers/gpu/nvgpu/gp10b/fb_gp10b.c +++ b/drivers/gpu/nvgpu/common/fb/fb_gp10b.c | |||
diff --git a/drivers/gpu/nvgpu/gp10b/fb_gp10b.h b/drivers/gpu/nvgpu/common/fb/fb_gp10b.h index 52aa2a75..52aa2a75 100644 --- a/drivers/gpu/nvgpu/gp10b/fb_gp10b.h +++ b/drivers/gpu/nvgpu/common/fb/fb_gp10b.h | |||
diff --git a/drivers/gpu/nvgpu/gv100/fb_gv100.c b/drivers/gpu/nvgpu/common/fb/fb_gv100.c index 1889268f..155c1e8b 100644 --- a/drivers/gpu/nvgpu/gv100/fb_gv100.c +++ b/drivers/gpu/nvgpu/common/fb/fb_gv100.c | |||
@@ -37,9 +37,10 @@ | |||
37 | #include <nvgpu/falcon.h> | 37 | #include <nvgpu/falcon.h> |
38 | 38 | ||
39 | #include "gk20a/gk20a.h" | 39 | #include "gk20a/gk20a.h" |
40 | #include "gv100/fb_gv100.h" | ||
41 | #include "gm20b/acr_gm20b.h" | 40 | #include "gm20b/acr_gm20b.h" |
42 | 41 | ||
42 | #include "fb_gv100.h" | ||
43 | |||
43 | #include <nvgpu/hw/gv100/hw_fb_gv100.h> | 44 | #include <nvgpu/hw/gv100/hw_fb_gv100.h> |
44 | #include <nvgpu/hw/gv100/hw_falcon_gv100.h> | 45 | #include <nvgpu/hw/gv100/hw_falcon_gv100.h> |
45 | #include <nvgpu/hw/gv100/hw_mc_gv100.h> | 46 | #include <nvgpu/hw/gv100/hw_mc_gv100.h> |
diff --git a/drivers/gpu/nvgpu/gv100/fb_gv100.h b/drivers/gpu/nvgpu/common/fb/fb_gv100.h index 195baccf..195baccf 100644 --- a/drivers/gpu/nvgpu/gv100/fb_gv100.h +++ b/drivers/gpu/nvgpu/common/fb/fb_gv100.h | |||
diff --git a/drivers/gpu/nvgpu/gv11b/fb_gv11b.c b/drivers/gpu/nvgpu/common/fb/fb_gv11b.c index c0fcf051..69a71575 100644 --- a/drivers/gpu/nvgpu/gv11b/fb_gv11b.c +++ b/drivers/gpu/nvgpu/common/fb/fb_gv11b.c | |||
@@ -32,14 +32,14 @@ | |||
32 | 32 | ||
33 | #include "gk20a/gk20a.h" | 33 | #include "gk20a/gk20a.h" |
34 | #include "gk20a/mm_gk20a.h" | 34 | #include "gk20a/mm_gk20a.h" |
35 | #include "gk20a/fb_gk20a.h" | ||
36 | |||
37 | #include "gp10b/fb_gp10b.h" | ||
38 | 35 | ||
39 | #include "gv11b/fifo_gv11b.h" | 36 | #include "gv11b/fifo_gv11b.h" |
40 | #include "gv11b/fb_gv11b.h" | ||
41 | #include "gv11b/ce_gv11b.h" | 37 | #include "gv11b/ce_gv11b.h" |
42 | 38 | ||
39 | #include "fb_gk20a.h" | ||
40 | #include "fb_gp10b.h" | ||
41 | #include "fb_gv11b.h" | ||
42 | |||
43 | #include <nvgpu/hw/gv11b/hw_fb_gv11b.h> | 43 | #include <nvgpu/hw/gv11b/hw_fb_gv11b.h> |
44 | #include <nvgpu/hw/gv11b/hw_mc_gv11b.h> | 44 | #include <nvgpu/hw/gv11b/hw_mc_gv11b.h> |
45 | #include <nvgpu/hw/gv11b/hw_ram_gv11b.h> | 45 | #include <nvgpu/hw/gv11b/hw_ram_gv11b.h> |
diff --git a/drivers/gpu/nvgpu/gv11b/fb_gv11b.h b/drivers/gpu/nvgpu/common/fb/fb_gv11b.h index fe2c733d..71fb3a41 100644 --- a/drivers/gpu/nvgpu/gv11b/fb_gv11b.h +++ b/drivers/gpu/nvgpu/common/fb/fb_gv11b.h | |||
@@ -29,6 +29,7 @@ | |||
29 | #define REPLAY_REG_INDEX 1 | 29 | #define REPLAY_REG_INDEX 1 |
30 | 30 | ||
31 | struct gk20a; | 31 | struct gk20a; |
32 | struct gr_gk20a; | ||
32 | 33 | ||
33 | void gv11b_fb_init_hw(struct gk20a *g); | 34 | void gv11b_fb_init_hw(struct gk20a *g); |
34 | 35 | ||
diff --git a/drivers/gpu/nvgpu/gm20b/hal_gm20b.c b/drivers/gpu/nvgpu/gm20b/hal_gm20b.c index 02355450..30349304 100644 --- a/drivers/gpu/nvgpu/gm20b/hal_gm20b.c +++ b/drivers/gpu/nvgpu/gm20b/hal_gm20b.c | |||
@@ -26,11 +26,12 @@ | |||
26 | #include "common/bus/bus_gm20b.h" | 26 | #include "common/bus/bus_gm20b.h" |
27 | #include "common/bus/bus_gk20a.h" | 27 | #include "common/bus/bus_gk20a.h" |
28 | #include "common/ptimer/ptimer_gk20a.h" | 28 | #include "common/ptimer/ptimer_gk20a.h" |
29 | #include "common/fb/fb_gk20a.h" | ||
30 | #include "common/fb/fb_gm20b.h" | ||
29 | 31 | ||
30 | #include "gk20a/gk20a.h" | 32 | #include "gk20a/gk20a.h" |
31 | #include "gk20a/ce2_gk20a.h" | 33 | #include "gk20a/ce2_gk20a.h" |
32 | #include "gk20a/dbg_gpu_gk20a.h" | 34 | #include "gk20a/dbg_gpu_gk20a.h" |
33 | #include "gk20a/fb_gk20a.h" | ||
34 | #include "gk20a/fifo_gk20a.h" | 35 | #include "gk20a/fifo_gk20a.h" |
35 | #include "gk20a/therm_gk20a.h" | 36 | #include "gk20a/therm_gk20a.h" |
36 | #include "gk20a/mm_gk20a.h" | 37 | #include "gk20a/mm_gk20a.h" |
@@ -46,7 +47,6 @@ | |||
46 | #include "ltc_gm20b.h" | 47 | #include "ltc_gm20b.h" |
47 | #include "gr_gm20b.h" | 48 | #include "gr_gm20b.h" |
48 | #include "ltc_gm20b.h" | 49 | #include "ltc_gm20b.h" |
49 | #include "fb_gm20b.h" | ||
50 | #include "fifo_gm20b.h" | 50 | #include "fifo_gm20b.h" |
51 | #include "gr_ctx_gm20b.h" | 51 | #include "gr_ctx_gm20b.h" |
52 | #include "mm_gm20b.h" | 52 | #include "mm_gm20b.h" |
diff --git a/drivers/gpu/nvgpu/gp106/hal_gp106.c b/drivers/gpu/nvgpu/gp106/hal_gp106.c index 75e2f5a1..63e6206a 100644 --- a/drivers/gpu/nvgpu/gp106/hal_gp106.c +++ b/drivers/gpu/nvgpu/gp106/hal_gp106.c | |||
@@ -27,6 +27,10 @@ | |||
27 | #include "common/ptimer/ptimer_gk20a.h" | 27 | #include "common/ptimer/ptimer_gk20a.h" |
28 | #include "common/bus/bus_gm20b.h" | 28 | #include "common/bus/bus_gm20b.h" |
29 | #include "common/bus/bus_gp10b.h" | 29 | #include "common/bus/bus_gp10b.h" |
30 | #include "common/fb/fb_gk20a.h" | ||
31 | #include "common/fb/fb_gp10b.h" | ||
32 | #include "common/fb/fb_gm20b.h" | ||
33 | #include "common/fb/fb_gp106.h" | ||
30 | 34 | ||
31 | #include "gk20a/gk20a.h" | 35 | #include "gk20a/gk20a.h" |
32 | #include "gk20a/fifo_gk20a.h" | 36 | #include "gk20a/fifo_gk20a.h" |
@@ -37,7 +41,6 @@ | |||
37 | #include "gk20a/flcn_gk20a.h" | 41 | #include "gk20a/flcn_gk20a.h" |
38 | #include "gk20a/regops_gk20a.h" | 42 | #include "gk20a/regops_gk20a.h" |
39 | #include "gk20a/mc_gk20a.h" | 43 | #include "gk20a/mc_gk20a.h" |
40 | #include "gk20a/fb_gk20a.h" | ||
41 | #include "gk20a/pmu_gk20a.h" | 44 | #include "gk20a/pmu_gk20a.h" |
42 | #include "gk20a/gr_gk20a.h" | 45 | #include "gk20a/gr_gk20a.h" |
43 | 46 | ||
@@ -50,7 +53,6 @@ | |||
50 | #include "gp10b/regops_gp10b.h" | 53 | #include "gp10b/regops_gp10b.h" |
51 | #include "gp10b/priv_ring_gp10b.h" | 54 | #include "gp10b/priv_ring_gp10b.h" |
52 | #include "gp10b/fifo_gp10b.h" | 55 | #include "gp10b/fifo_gp10b.h" |
53 | #include "gp10b/fb_gp10b.h" | ||
54 | #include "gp10b/pmu_gp10b.h" | 56 | #include "gp10b/pmu_gp10b.h" |
55 | #include "gp10b/gr_gp10b.h" | 57 | #include "gp10b/gr_gp10b.h" |
56 | #include "gp10b/priv_ring_gp10b.h" | 58 | #include "gp10b/priv_ring_gp10b.h" |
@@ -63,7 +65,6 @@ | |||
63 | #include "gm20b/fifo_gm20b.h" | 65 | #include "gm20b/fifo_gm20b.h" |
64 | #include "gm20b/mm_gm20b.h" | 66 | #include "gm20b/mm_gm20b.h" |
65 | #include "gm20b/pmu_gm20b.h" | 67 | #include "gm20b/pmu_gm20b.h" |
66 | #include "gm20b/fb_gm20b.h" | ||
67 | #include "gm20b/acr_gm20b.h" | 68 | #include "gm20b/acr_gm20b.h" |
68 | #include "gm20b/gr_gm20b.h" | 69 | #include "gm20b/gr_gm20b.h" |
69 | 70 | ||
@@ -81,7 +82,6 @@ | |||
81 | #include "gp106/pmu_gp106.h" | 82 | #include "gp106/pmu_gp106.h" |
82 | #include "gp106/gr_ctx_gp106.h" | 83 | #include "gp106/gr_ctx_gp106.h" |
83 | #include "gp106/gr_gp106.h" | 84 | #include "gp106/gr_gp106.h" |
84 | #include "gp106/fb_gp106.h" | ||
85 | #include "gp106/flcn_gp106.h" | 85 | #include "gp106/flcn_gp106.h" |
86 | #include "gp106/fuse_gp106.h" | 86 | #include "gp106/fuse_gp106.h" |
87 | 87 | ||
diff --git a/drivers/gpu/nvgpu/gp10b/hal_gp10b.c b/drivers/gpu/nvgpu/gp10b/hal_gp10b.c index a40608df..bbfce287 100644 --- a/drivers/gpu/nvgpu/gp10b/hal_gp10b.c +++ b/drivers/gpu/nvgpu/gp10b/hal_gp10b.c | |||
@@ -27,6 +27,9 @@ | |||
27 | #include "common/ptimer/ptimer_gk20a.h" | 27 | #include "common/ptimer/ptimer_gk20a.h" |
28 | #include "common/bus/bus_gm20b.h" | 28 | #include "common/bus/bus_gm20b.h" |
29 | #include "common/bus/bus_gp10b.h" | 29 | #include "common/bus/bus_gp10b.h" |
30 | #include "common/fb/fb_gk20a.h" | ||
31 | #include "common/fb/fb_gm20b.h" | ||
32 | #include "common/fb/fb_gp10b.h" | ||
30 | 33 | ||
31 | #include "gk20a/gk20a.h" | 34 | #include "gk20a/gk20a.h" |
32 | #include "gk20a/fifo_gk20a.h" | 35 | #include "gk20a/fifo_gk20a.h" |
@@ -37,7 +40,6 @@ | |||
37 | #include "gk20a/flcn_gk20a.h" | 40 | #include "gk20a/flcn_gk20a.h" |
38 | #include "gk20a/regops_gk20a.h" | 41 | #include "gk20a/regops_gk20a.h" |
39 | #include "gk20a/mc_gk20a.h" | 42 | #include "gk20a/mc_gk20a.h" |
40 | #include "gk20a/fb_gk20a.h" | ||
41 | #include "gk20a/pmu_gk20a.h" | 43 | #include "gk20a/pmu_gk20a.h" |
42 | #include "gk20a/gr_gk20a.h" | 44 | #include "gk20a/gr_gk20a.h" |
43 | #include "gk20a/tsg_gk20a.h" | 45 | #include "gk20a/tsg_gk20a.h" |
@@ -48,7 +50,6 @@ | |||
48 | #include "gp10b/ltc_gp10b.h" | 50 | #include "gp10b/ltc_gp10b.h" |
49 | #include "gp10b/mm_gp10b.h" | 51 | #include "gp10b/mm_gp10b.h" |
50 | #include "gp10b/ce_gp10b.h" | 52 | #include "gp10b/ce_gp10b.h" |
51 | #include "gp10b/fb_gp10b.h" | ||
52 | #include "gp10b/pmu_gp10b.h" | 53 | #include "gp10b/pmu_gp10b.h" |
53 | #include "gp10b/gr_ctx_gp10b.h" | 54 | #include "gp10b/gr_ctx_gp10b.h" |
54 | #include "gp10b/fifo_gp10b.h" | 55 | #include "gp10b/fifo_gp10b.h" |
@@ -62,7 +63,6 @@ | |||
62 | #include "gm20b/acr_gm20b.h" | 63 | #include "gm20b/acr_gm20b.h" |
63 | #include "gm20b/pmu_gm20b.h" | 64 | #include "gm20b/pmu_gm20b.h" |
64 | #include "gm20b/clk_gm20b.h" | 65 | #include "gm20b/clk_gm20b.h" |
65 | #include "gm20b/fb_gm20b.h" | ||
66 | #include "gm20b/mm_gm20b.h" | 66 | #include "gm20b/mm_gm20b.h" |
67 | 67 | ||
68 | #include "gp10b.h" | 68 | #include "gp10b.h" |
diff --git a/drivers/gpu/nvgpu/gv100/hal_gv100.c b/drivers/gpu/nvgpu/gv100/hal_gv100.c index 9c3eb91a..6f340e6a 100644 --- a/drivers/gpu/nvgpu/gv100/hal_gv100.c +++ b/drivers/gpu/nvgpu/gv100/hal_gv100.c | |||
@@ -27,6 +27,11 @@ | |||
27 | #include "common/bus/bus_gv100.h" | 27 | #include "common/bus/bus_gv100.h" |
28 | #include "common/clock_gating/gv100_gating_reglist.h" | 28 | #include "common/clock_gating/gv100_gating_reglist.h" |
29 | #include "common/ptimer/ptimer_gk20a.h" | 29 | #include "common/ptimer/ptimer_gk20a.h" |
30 | #include "common/fb/fb_gk20a.h" | ||
31 | #include "common/fb/fb_gm20b.h" | ||
32 | #include "common/fb/fb_gp10b.h" | ||
33 | #include "common/fb/fb_gv11b.h" | ||
34 | #include "common/fb/fb_gv100.h" | ||
30 | 35 | ||
31 | #include "gk20a/gk20a.h" | 36 | #include "gk20a/gk20a.h" |
32 | #include "gk20a/fifo_gk20a.h" | 37 | #include "gk20a/fifo_gk20a.h" |
@@ -36,7 +41,6 @@ | |||
36 | #include "gk20a/dbg_gpu_gk20a.h" | 41 | #include "gk20a/dbg_gpu_gk20a.h" |
37 | #include "gk20a/flcn_gk20a.h" | 42 | #include "gk20a/flcn_gk20a.h" |
38 | #include "gk20a/regops_gk20a.h" | 43 | #include "gk20a/regops_gk20a.h" |
39 | #include "gk20a/fb_gk20a.h" | ||
40 | #include "gk20a/mm_gk20a.h" | 44 | #include "gk20a/mm_gk20a.h" |
41 | #include "gk20a/pmu_gk20a.h" | 45 | #include "gk20a/pmu_gk20a.h" |
42 | #include "gk20a/gr_gk20a.h" | 46 | #include "gk20a/gr_gk20a.h" |
@@ -44,7 +48,6 @@ | |||
44 | #include "gm20b/ltc_gm20b.h" | 48 | #include "gm20b/ltc_gm20b.h" |
45 | #include "gm20b/gr_gm20b.h" | 49 | #include "gm20b/gr_gm20b.h" |
46 | #include "gm20b/fifo_gm20b.h" | 50 | #include "gm20b/fifo_gm20b.h" |
47 | #include "gm20b/fb_gm20b.h" | ||
48 | #include "gm20b/mm_gm20b.h" | 51 | #include "gm20b/mm_gm20b.h" |
49 | #include "gm20b/pmu_gm20b.h" | 52 | #include "gm20b/pmu_gm20b.h" |
50 | #include "gm20b/acr_gm20b.h" | 53 | #include "gm20b/acr_gm20b.h" |
@@ -60,7 +63,6 @@ | |||
60 | #include "gp106/clk_gp106.h" | 63 | #include "gp106/clk_gp106.h" |
61 | #include "gp106/flcn_gp106.h" | 64 | #include "gp106/flcn_gp106.h" |
62 | 65 | ||
63 | #include "gp10b/fb_gp10b.h" | ||
64 | #include "gp10b/gr_gp10b.h" | 66 | #include "gp10b/gr_gp10b.h" |
65 | #include "gp10b/ltc_gp10b.h" | 67 | #include "gp10b/ltc_gp10b.h" |
66 | #include "gp10b/therm_gp10b.h" | 68 | #include "gp10b/therm_gp10b.h" |
@@ -82,7 +84,6 @@ | |||
82 | #include "gv11b/ce_gv11b.h" | 84 | #include "gv11b/ce_gv11b.h" |
83 | #include "gv11b/mm_gv11b.h" | 85 | #include "gv11b/mm_gv11b.h" |
84 | #include "gv11b/pmu_gv11b.h" | 86 | #include "gv11b/pmu_gv11b.h" |
85 | #include "gv11b/fb_gv11b.h" | ||
86 | #include "gv11b/pmu_gv11b.h" | 87 | #include "gv11b/pmu_gv11b.h" |
87 | #include "gv11b/fifo_gv11b.h" | 88 | #include "gv11b/fifo_gv11b.h" |
88 | #include "gv11b/regops_gv11b.h" | 89 | #include "gv11b/regops_gv11b.h" |
@@ -91,7 +92,6 @@ | |||
91 | #include "gv100.h" | 92 | #include "gv100.h" |
92 | #include "hal_gv100.h" | 93 | #include "hal_gv100.h" |
93 | #include "gv100/bios_gv100.h" | 94 | #include "gv100/bios_gv100.h" |
94 | #include "gv100/fb_gv100.h" | ||
95 | #include "gv100/fifo_gv100.h" | 95 | #include "gv100/fifo_gv100.h" |
96 | #include "gv100/flcn_gv100.h" | 96 | #include "gv100/flcn_gv100.h" |
97 | #include "gv100/gr_ctx_gv100.h" | 97 | #include "gv100/gr_ctx_gv100.h" |
diff --git a/drivers/gpu/nvgpu/gv100/mc_gv100.c b/drivers/gpu/nvgpu/gv100/mc_gv100.c index 3d6f0bd3..46af100a 100644 --- a/drivers/gpu/nvgpu/gv100/mc_gv100.c +++ b/drivers/gpu/nvgpu/gv100/mc_gv100.c | |||
@@ -29,7 +29,6 @@ | |||
29 | #include "gp10b/mc_gp10b.h" | 29 | #include "gp10b/mc_gp10b.h" |
30 | 30 | ||
31 | #include "mc_gv100.h" | 31 | #include "mc_gv100.h" |
32 | #include "gv11b/fb_gv11b.h" | ||
33 | 32 | ||
34 | #include <nvgpu/hw/gv100/hw_mc_gv100.h> | 33 | #include <nvgpu/hw/gv100/hw_mc_gv100.h> |
35 | 34 | ||
@@ -41,7 +40,6 @@ void mc_gv100_intr_enable(struct gk20a *g) | |||
41 | 0xffffffffU); | 40 | 0xffffffffU); |
42 | gk20a_writel(g, mc_intr_en_clear_r(NVGPU_MC_INTR_NONSTALLING), | 41 | gk20a_writel(g, mc_intr_en_clear_r(NVGPU_MC_INTR_NONSTALLING), |
43 | 0xffffffffU); | 42 | 0xffffffffU); |
44 | |||
45 | g->mc_intr_mask_restore[NVGPU_MC_INTR_STALLING] = | 43 | g->mc_intr_mask_restore[NVGPU_MC_INTR_STALLING] = |
46 | mc_intr_pfifo_pending_f() | | 44 | mc_intr_pfifo_pending_f() | |
47 | mc_intr_hub_pending_f() | | 45 | mc_intr_hub_pending_f() | |
diff --git a/drivers/gpu/nvgpu/gv11b/hal_gv11b.c b/drivers/gpu/nvgpu/gv11b/hal_gv11b.c index 09f74042..325285a6 100644 --- a/drivers/gpu/nvgpu/gv11b/hal_gv11b.c +++ b/drivers/gpu/nvgpu/gv11b/hal_gv11b.c | |||
@@ -27,6 +27,10 @@ | |||
27 | #include "common/bus/bus_gm20b.h" | 27 | #include "common/bus/bus_gm20b.h" |
28 | #include "common/clock_gating/gv11b_gating_reglist.h" | 28 | #include "common/clock_gating/gv11b_gating_reglist.h" |
29 | #include "common/ptimer/ptimer_gk20a.h" | 29 | #include "common/ptimer/ptimer_gk20a.h" |
30 | #include "common/fb/fb_gk20a.h" | ||
31 | #include "common/fb/fb_gm20b.h" | ||
32 | #include "common/fb/fb_gp10b.h" | ||
33 | #include "common/fb/fb_gv11b.h" | ||
30 | 34 | ||
31 | #include "gk20a/gk20a.h" | 35 | #include "gk20a/gk20a.h" |
32 | #include "gk20a/fifo_gk20a.h" | 36 | #include "gk20a/fifo_gk20a.h" |
@@ -37,13 +41,11 @@ | |||
37 | #include "gk20a/dbg_gpu_gk20a.h" | 41 | #include "gk20a/dbg_gpu_gk20a.h" |
38 | #include "gk20a/flcn_gk20a.h" | 42 | #include "gk20a/flcn_gk20a.h" |
39 | #include "gk20a/regops_gk20a.h" | 43 | #include "gk20a/regops_gk20a.h" |
40 | #include "gk20a/fb_gk20a.h" | ||
41 | #include "gk20a/pmu_gk20a.h" | 44 | #include "gk20a/pmu_gk20a.h" |
42 | #include "gk20a/gr_gk20a.h" | 45 | #include "gk20a/gr_gk20a.h" |
43 | 46 | ||
44 | #include "gm20b/ltc_gm20b.h" | 47 | #include "gm20b/ltc_gm20b.h" |
45 | #include "gm20b/gr_gm20b.h" | 48 | #include "gm20b/gr_gm20b.h" |
46 | #include "gm20b/fb_gm20b.h" | ||
47 | #include "gm20b/fifo_gm20b.h" | 49 | #include "gm20b/fifo_gm20b.h" |
48 | #include "gm20b/mm_gm20b.h" | 50 | #include "gm20b/mm_gm20b.h" |
49 | #include "gm20b/acr_gm20b.h" | 51 | #include "gm20b/acr_gm20b.h" |
@@ -56,7 +58,6 @@ | |||
56 | #include "gp10b/priv_ring_gp10b.h" | 58 | #include "gp10b/priv_ring_gp10b.h" |
57 | #include "gp10b/fifo_gp10b.h" | 59 | #include "gp10b/fifo_gp10b.h" |
58 | #include "gp10b/fecs_trace_gp10b.h" | 60 | #include "gp10b/fecs_trace_gp10b.h" |
59 | #include "gp10b/fb_gp10b.h" | ||
60 | #include "gp10b/mm_gp10b.h" | 61 | #include "gp10b/mm_gp10b.h" |
61 | #include "gp10b/pmu_gp10b.h" | 62 | #include "gp10b/pmu_gp10b.h" |
62 | #include "gp10b/gr_gp10b.h" | 63 | #include "gp10b/gr_gp10b.h" |
@@ -79,7 +80,6 @@ | |||
79 | #include "mm_gv11b.h" | 80 | #include "mm_gv11b.h" |
80 | #include "pmu_gv11b.h" | 81 | #include "pmu_gv11b.h" |
81 | #include "acr_gv11b.h" | 82 | #include "acr_gv11b.h" |
82 | #include "fb_gv11b.h" | ||
83 | #include "fifo_gv11b.h" | 83 | #include "fifo_gv11b.h" |
84 | #include "regops_gv11b.h" | 84 | #include "regops_gv11b.h" |
85 | #include "subctx_gv11b.h" | 85 | #include "subctx_gv11b.h" |
diff --git a/drivers/gpu/nvgpu/gv11b/mc_gv11b.c b/drivers/gpu/nvgpu/gv11b/mc_gv11b.c index b7a3ce62..64680fc6 100644 --- a/drivers/gpu/nvgpu/gv11b/mc_gv11b.c +++ b/drivers/gpu/nvgpu/gv11b/mc_gv11b.c | |||
@@ -29,7 +29,6 @@ | |||
29 | #include "gp10b/mc_gp10b.h" | 29 | #include "gp10b/mc_gp10b.h" |
30 | 30 | ||
31 | #include "mc_gv11b.h" | 31 | #include "mc_gv11b.h" |
32 | #include "fb_gv11b.h" | ||
33 | 32 | ||
34 | #include <nvgpu/hw/gv11b/hw_mc_gv11b.h> | 33 | #include <nvgpu/hw/gv11b/hw_mc_gv11b.h> |
35 | 34 | ||
diff --git a/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_hal_gp10b.c b/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_hal_gp10b.c index 349548cd..421f3692 100644 --- a/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_hal_gp10b.c +++ b/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_hal_gp10b.c | |||
@@ -23,6 +23,9 @@ | |||
23 | #include "common/bus/bus_gk20a.h" | 23 | #include "common/bus/bus_gk20a.h" |
24 | #include "common/bus/bus_gm20b.h" | 24 | #include "common/bus/bus_gm20b.h" |
25 | #include "common/clock_gating/gp10b_gating_reglist.h" | 25 | #include "common/clock_gating/gp10b_gating_reglist.h" |
26 | #include "common/fb/fb_gk20a.h" | ||
27 | #include "common/fb/fb_gm20b.h" | ||
28 | #include "common/fb/fb_gp10b.h" | ||
26 | 29 | ||
27 | #include "vgpu/fifo_vgpu.h" | 30 | #include "vgpu/fifo_vgpu.h" |
28 | #include "vgpu/gr_vgpu.h" | 31 | #include "vgpu/gr_vgpu.h" |
@@ -40,14 +43,12 @@ | |||
40 | 43 | ||
41 | #include "gk20a/flcn_gk20a.h" | 44 | #include "gk20a/flcn_gk20a.h" |
42 | #include "gk20a/mc_gk20a.h" | 45 | #include "gk20a/mc_gk20a.h" |
43 | #include "gk20a/fb_gk20a.h" | ||
44 | #include "gk20a/dbg_gpu_gk20a.h" | 46 | #include "gk20a/dbg_gpu_gk20a.h" |
45 | 47 | ||
46 | #include "gp10b/mc_gp10b.h" | 48 | #include "gp10b/mc_gp10b.h" |
47 | #include "gp10b/ltc_gp10b.h" | 49 | #include "gp10b/ltc_gp10b.h" |
48 | #include "gp10b/mm_gp10b.h" | 50 | #include "gp10b/mm_gp10b.h" |
49 | #include "gp10b/ce_gp10b.h" | 51 | #include "gp10b/ce_gp10b.h" |
50 | #include "gp10b/fb_gp10b.h" | ||
51 | #include "gp10b/pmu_gp10b.h" | 52 | #include "gp10b/pmu_gp10b.h" |
52 | #include "gp10b/gr_gp10b.h" | 53 | #include "gp10b/gr_gp10b.h" |
53 | #include "gp10b/gr_ctx_gp10b.h" | 54 | #include "gp10b/gr_ctx_gp10b.h" |
@@ -61,7 +62,6 @@ | |||
61 | #include "gm20b/fifo_gm20b.h" | 62 | #include "gm20b/fifo_gm20b.h" |
62 | #include "gm20b/acr_gm20b.h" | 63 | #include "gm20b/acr_gm20b.h" |
63 | #include "gm20b/pmu_gm20b.h" | 64 | #include "gm20b/pmu_gm20b.h" |
64 | #include "gm20b/fb_gm20b.h" | ||
65 | #include "gm20b/mm_gm20b.h" | 65 | #include "gm20b/mm_gm20b.h" |
66 | 66 | ||
67 | #include <nvgpu/enabled.h> | 67 | #include <nvgpu/enabled.h> |
diff --git a/drivers/gpu/nvgpu/vgpu/gv11b/vgpu_hal_gv11b.c b/drivers/gpu/nvgpu/vgpu/gv11b/vgpu_hal_gv11b.c index 577c8f6e..38f9a184 100644 --- a/drivers/gpu/nvgpu/vgpu/gv11b/vgpu_hal_gv11b.c +++ b/drivers/gpu/nvgpu/vgpu/gv11b/vgpu_hal_gv11b.c | |||
@@ -23,6 +23,10 @@ | |||
23 | #include "common/bus/bus_gk20a.h" | 23 | #include "common/bus/bus_gk20a.h" |
24 | #include "common/bus/bus_gm20b.h" | 24 | #include "common/bus/bus_gm20b.h" |
25 | #include "common/clock_gating/gv11b_gating_reglist.h" | 25 | #include "common/clock_gating/gv11b_gating_reglist.h" |
26 | #include "common/fb/fb_gk20a.h" | ||
27 | #include "common/fb/fb_gm20b.h" | ||
28 | #include "common/fb/fb_gp10b.h" | ||
29 | #include "common/fb/fb_gv11b.h" | ||
26 | 30 | ||
27 | #include <gk20a/gk20a.h> | 31 | #include <gk20a/gk20a.h> |
28 | #include <gv11b/hal_gv11b.h> | 32 | #include <gv11b/hal_gv11b.h> |
@@ -40,20 +44,17 @@ | |||
40 | #include "vgpu/gp10b/vgpu_mm_gp10b.h" | 44 | #include "vgpu/gp10b/vgpu_mm_gp10b.h" |
41 | #include "vgpu/gp10b/vgpu_gr_gp10b.h" | 45 | #include "vgpu/gp10b/vgpu_gr_gp10b.h" |
42 | 46 | ||
43 | #include <gk20a/fb_gk20a.h> | ||
44 | #include <gk20a/flcn_gk20a.h> | 47 | #include <gk20a/flcn_gk20a.h> |
45 | #include <gk20a/mc_gk20a.h> | 48 | #include <gk20a/mc_gk20a.h> |
46 | #include "gk20a/dbg_gpu_gk20a.h" | 49 | #include "gk20a/dbg_gpu_gk20a.h" |
47 | 50 | ||
48 | #include <gm20b/gr_gm20b.h> | 51 | #include <gm20b/gr_gm20b.h> |
49 | #include <gm20b/fb_gm20b.h> | ||
50 | #include <gm20b/fifo_gm20b.h> | 52 | #include <gm20b/fifo_gm20b.h> |
51 | #include <gm20b/pmu_gm20b.h> | 53 | #include <gm20b/pmu_gm20b.h> |
52 | #include <gm20b/mm_gm20b.h> | 54 | #include <gm20b/mm_gm20b.h> |
53 | #include <gm20b/acr_gm20b.h> | 55 | #include <gm20b/acr_gm20b.h> |
54 | #include <gm20b/ltc_gm20b.h> | 56 | #include <gm20b/ltc_gm20b.h> |
55 | 57 | ||
56 | #include <gp10b/fb_gp10b.h> | ||
57 | #include <gp10b/pmu_gp10b.h> | 58 | #include <gp10b/pmu_gp10b.h> |
58 | #include <gp10b/mm_gp10b.h> | 59 | #include <gp10b/mm_gp10b.h> |
59 | #include <gp10b/mc_gp10b.h> | 60 | #include <gp10b/mc_gp10b.h> |
@@ -67,7 +68,6 @@ | |||
67 | #include <gp106/pmu_gp106.h> | 68 | #include <gp106/pmu_gp106.h> |
68 | #include <gp106/acr_gp106.h> | 69 | #include <gp106/acr_gp106.h> |
69 | 70 | ||
70 | #include <gv11b/fb_gv11b.h> | ||
71 | #include <gv11b/pmu_gv11b.h> | 71 | #include <gv11b/pmu_gv11b.h> |
72 | #include <gv11b/acr_gv11b.h> | 72 | #include <gv11b/acr_gv11b.h> |
73 | #include <gv11b/mm_gv11b.h> | 73 | #include <gv11b/mm_gv11b.h> |