diff --git a/drivers/gpu/nvgpu/Makefile b/drivers/gpu/nvgpu/Makefile index 9ca762a3f..e715e3853 100644 --- a/drivers/gpu/nvgpu/Makefile +++ b/drivers/gpu/nvgpu/Makefile @@ -28,7 +28,13 @@ nvgpu-y += common/bus/bus_gk20a.o \ common/bus/bus_gp10b.o \ common/bus/bus_gv100.o \ common/ptimer/ptimer.o \ - common/ptimer/ptimer_gk20a.o + common/ptimer/ptimer_gk20a.o \ + common/fb/fb_gk20a.o \ + common/fb/fb_gm20b.o \ + common/fb/fb_gp10b.o \ + common/fb/fb_gp106.o \ + common/fb/fb_gv11b.o \ + common/fb/fb_gv100.o # Linux specific parts of nvgpu. nvgpu-y += \ @@ -194,7 +200,6 @@ nvgpu-y += \ gk20a/therm_gk20a.o \ gk20a/gr_ctx_gk20a_sim.o \ gk20a/gr_ctx_gk20a.o \ - gk20a/fb_gk20a.o \ gk20a/hal.o \ gk20a/tsg_gk20a.o \ gk20a/fecs_trace_gk20a.o \ @@ -203,7 +208,6 @@ nvgpu-y += \ gm20b/ltc_gm20b.o \ gm20b/gr_gm20b.o \ gm20b/clk_gm20b.o \ - gm20b/fb_gm20b.o \ gm20b/fifo_gm20b.o \ gm20b/gr_ctx_gm20b.o \ gm20b/acr_gm20b.o \ @@ -254,7 +258,6 @@ nvgpu-y += \ gp10b/fifo_gp10b.o \ gp10b/ltc_gp10b.o \ gp10b/mm_gp10b.o \ - gp10b/fb_gp10b.o \ gp10b/pmu_gp10b.o \ gp10b/hal_gp10b.o \ gp10b/regops_gp10b.o \ @@ -273,7 +276,6 @@ nvgpu-y += \ gp106/acr_gp106.o \ gp106/sec2_gp106.o \ gp106/fifo_gp106.o \ - gp106/fb_gp106.o \ gp106/regops_gp106.o \ gp106/bios_gp106.o \ gp106/fuse_gp106.o \ @@ -284,7 +286,6 @@ nvgpu-y += \ gv11b/ltc_gv11b.o \ gv11b/hal_gv11b.o \ gv11b/gr_gv11b.o \ - gv11b/fb_gv11b.o \ gv11b/fifo_gv11b.o \ gv11b/mm_gv11b.o \ gv11b/ce_gv11b.o \ @@ -296,7 +297,6 @@ nvgpu-y += \ gv11b/therm_gv11b.o \ gv100/mm_gv100.o \ gv100/gr_ctx_gv100.o \ - gv100/fb_gv100.o \ gv100/bios_gv100.o \ gv100/fifo_gv100.o \ gv100/gr_gv100.o \ diff --git a/drivers/gpu/nvgpu/Makefile.sources b/drivers/gpu/nvgpu/Makefile.sources index 6fa815ab4..c03405457 100644 --- a/drivers/gpu/nvgpu/Makefile.sources +++ b/drivers/gpu/nvgpu/Makefile.sources @@ -36,6 +36,12 @@ srcs := common/mm/nvgpu_allocator.c \ common/bus/bus_gm20b.c \ common/bus/bus_gp10b.c \ common/bus/bus_gv100.c \ + common/fb/fb_gk20a.c \ + common/fb/fb_gm20b.c \ + common/fb/fb_gp10b.c \ + common/fb/fb_gp106.c \ + common/fb/fb_gv100.c \ + common/fb/fb_gv11b.c \ common/enabled.c \ common/pramin.c \ common/semaphore.c \ @@ -129,7 +135,6 @@ srcs := common/mm/nvgpu_allocator.c \ gk20a/therm_gk20a.c \ gk20a/gr_ctx_gk20a_sim.c \ gk20a/gr_ctx_gk20a.c \ - gk20a/fb_gk20a.c \ gk20a/hal.c \ gk20a/tsg_gk20a.c \ gk20a/mc_gk20a.c \ @@ -137,7 +142,6 @@ srcs := common/mm/nvgpu_allocator.c \ gm20b/ltc_gm20b.c \ gm20b/gr_gm20b.c \ gm20b/clk_gm20b.c \ - gm20b/fb_gm20b.c \ gm20b/fifo_gm20b.c \ gm20b/gr_ctx_gm20b.c \ gm20b/acr_gm20b.c \ @@ -153,7 +157,6 @@ srcs := common/mm/nvgpu_allocator.c \ gp10b/fifo_gp10b.c \ gp10b/ltc_gp10b.c \ gp10b/mm_gp10b.c \ - gp10b/fb_gp10b.c \ gp10b/pmu_gp10b.c \ gp10b/hal_gp10b.c \ gp10b/regops_gp10b.c \ @@ -168,7 +171,6 @@ srcs := common/mm/nvgpu_allocator.c \ gv11b/ltc_gv11b.c \ gv11b/hal_gv11b.c \ gv11b/gr_gv11b.c \ - gv11b/fb_gv11b.c \ gv11b/fifo_gv11b.c \ gv11b/mm_gv11b.c \ gv11b/ce_gv11b.c \ @@ -188,7 +190,6 @@ srcs := common/mm/nvgpu_allocator.c \ gp106/acr_gp106.c \ gp106/sec2_gp106.c \ gp106/fifo_gp106.c \ - gp106/fb_gp106.c \ gp106/regops_gp106.c \ gp106/bios_gp106.c \ gp106/fuse_gp106.c \ @@ -198,7 +199,6 @@ srcs := common/mm/nvgpu_allocator.c \ gp106/therm_gp106.c \ gv100/mm_gv100.c \ gv100/gr_ctx_gv100.c \ - gv100/fb_gv100.c \ gv100/bios_gv100.c \ gv100/fifo_gv100.c \ gv100/gr_gv100.c \ diff --git a/drivers/gpu/nvgpu/gk20a/fb_gk20a.c b/drivers/gpu/nvgpu/common/fb/fb_gk20a.c similarity index 99% rename from drivers/gpu/nvgpu/gk20a/fb_gk20a.c rename to drivers/gpu/nvgpu/common/fb/fb_gk20a.c index c4be33137..d27ac9d07 100644 --- a/drivers/gpu/nvgpu/gk20a/fb_gk20a.c +++ b/drivers/gpu/nvgpu/common/fb/fb_gk20a.c @@ -24,7 +24,8 @@ #include -#include "gk20a.h" +#include "gk20a/gk20a.h" + #include "fb_gk20a.h" #include diff --git a/drivers/gpu/nvgpu/gk20a/fb_gk20a.h b/drivers/gpu/nvgpu/common/fb/fb_gk20a.h similarity index 100% rename from drivers/gpu/nvgpu/gk20a/fb_gk20a.h rename to 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 similarity index 99% rename from drivers/gpu/nvgpu/gm20b/fb_gm20b.c rename to drivers/gpu/nvgpu/common/fb/fb_gm20b.c index 37a7944bf..bd093b317 100644 --- a/drivers/gpu/nvgpu/gm20b/fb_gm20b.c +++ b/drivers/gpu/nvgpu/common/fb/fb_gm20b.c @@ -25,8 +25,9 @@ #include #include "gk20a/gk20a.h" -#include "gk20a/fb_gk20a.h" -#include "gm20b/fb_gm20b.h" + +#include "fb_gk20a.h" +#include "fb_gm20b.h" #include #include diff --git a/drivers/gpu/nvgpu/gm20b/fb_gm20b.h b/drivers/gpu/nvgpu/common/fb/fb_gm20b.h similarity index 98% rename from drivers/gpu/nvgpu/gm20b/fb_gm20b.h rename to drivers/gpu/nvgpu/common/fb/fb_gm20b.h index 1a5e91875..eb868b018 100644 --- a/drivers/gpu/nvgpu/gm20b/fb_gm20b.h +++ b/drivers/gpu/nvgpu/common/fb/fb_gm20b.h @@ -24,7 +24,9 @@ #ifndef _NVHOST_GM20B_FB #define _NVHOST_GM20B_FB + struct gk20a; +struct wpr_carveout_info; void fb_gm20b_init_fs_state(struct gk20a *g); 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 similarity index 98% rename from drivers/gpu/nvgpu/gp106/fb_gp106.c rename to drivers/gpu/nvgpu/common/fb/fb_gp106.c index 2bf97f610..6f257db49 100644 --- a/drivers/gpu/nvgpu/gp106/fb_gp106.c +++ b/drivers/gpu/nvgpu/common/fb/fb_gp106.c @@ -21,8 +21,8 @@ */ #include "gk20a/gk20a.h" -#include "gp10b/fb_gp10b.h" +#include "fb_gp10b.h" #include "fb_gp106.h" #include diff --git a/drivers/gpu/nvgpu/gp106/fb_gp106.h b/drivers/gpu/nvgpu/common/fb/fb_gp106.h similarity index 100% rename from drivers/gpu/nvgpu/gp106/fb_gp106.h rename to 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 similarity index 100% rename from drivers/gpu/nvgpu/gp10b/fb_gp10b.c rename to 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 similarity index 100% rename from drivers/gpu/nvgpu/gp10b/fb_gp10b.h rename to 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 similarity index 99% rename from drivers/gpu/nvgpu/gv100/fb_gv100.c rename to drivers/gpu/nvgpu/common/fb/fb_gv100.c index 1889268fb..155c1e8b0 100644 --- a/drivers/gpu/nvgpu/gv100/fb_gv100.c +++ b/drivers/gpu/nvgpu/common/fb/fb_gv100.c @@ -37,9 +37,10 @@ #include #include "gk20a/gk20a.h" -#include "gv100/fb_gv100.h" #include "gm20b/acr_gm20b.h" +#include "fb_gv100.h" + #include #include #include diff --git a/drivers/gpu/nvgpu/gv100/fb_gv100.h b/drivers/gpu/nvgpu/common/fb/fb_gv100.h similarity index 100% rename from drivers/gpu/nvgpu/gv100/fb_gv100.h rename to 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 similarity index 99% rename from drivers/gpu/nvgpu/gv11b/fb_gv11b.c rename to drivers/gpu/nvgpu/common/fb/fb_gv11b.c index c0fcf0512..69a715759 100644 --- a/drivers/gpu/nvgpu/gv11b/fb_gv11b.c +++ b/drivers/gpu/nvgpu/common/fb/fb_gv11b.c @@ -32,14 +32,14 @@ #include "gk20a/gk20a.h" #include "gk20a/mm_gk20a.h" -#include "gk20a/fb_gk20a.h" - -#include "gp10b/fb_gp10b.h" #include "gv11b/fifo_gv11b.h" -#include "gv11b/fb_gv11b.h" #include "gv11b/ce_gv11b.h" +#include "fb_gk20a.h" +#include "fb_gp10b.h" +#include "fb_gv11b.h" + #include #include #include diff --git a/drivers/gpu/nvgpu/gv11b/fb_gv11b.h b/drivers/gpu/nvgpu/common/fb/fb_gv11b.h similarity index 99% rename from drivers/gpu/nvgpu/gv11b/fb_gv11b.h rename to drivers/gpu/nvgpu/common/fb/fb_gv11b.h index fe2c733d1..71fb3a415 100644 --- a/drivers/gpu/nvgpu/gv11b/fb_gv11b.h +++ b/drivers/gpu/nvgpu/common/fb/fb_gv11b.h @@ -29,6 +29,7 @@ #define REPLAY_REG_INDEX 1 struct gk20a; +struct gr_gk20a; void gv11b_fb_init_hw(struct gk20a *g); diff --git a/drivers/gpu/nvgpu/gm20b/hal_gm20b.c b/drivers/gpu/nvgpu/gm20b/hal_gm20b.c index 02355450e..303493040 100644 --- a/drivers/gpu/nvgpu/gm20b/hal_gm20b.c +++ b/drivers/gpu/nvgpu/gm20b/hal_gm20b.c @@ -26,11 +26,12 @@ #include "common/bus/bus_gm20b.h" #include "common/bus/bus_gk20a.h" #include "common/ptimer/ptimer_gk20a.h" +#include "common/fb/fb_gk20a.h" +#include "common/fb/fb_gm20b.h" #include "gk20a/gk20a.h" #include "gk20a/ce2_gk20a.h" #include "gk20a/dbg_gpu_gk20a.h" -#include "gk20a/fb_gk20a.h" #include "gk20a/fifo_gk20a.h" #include "gk20a/therm_gk20a.h" #include "gk20a/mm_gk20a.h" @@ -46,7 +47,6 @@ #include "ltc_gm20b.h" #include "gr_gm20b.h" #include "ltc_gm20b.h" -#include "fb_gm20b.h" #include "fifo_gm20b.h" #include "gr_ctx_gm20b.h" #include "mm_gm20b.h" diff --git a/drivers/gpu/nvgpu/gp106/hal_gp106.c b/drivers/gpu/nvgpu/gp106/hal_gp106.c index 75e2f5a15..63e6206a5 100644 --- a/drivers/gpu/nvgpu/gp106/hal_gp106.c +++ b/drivers/gpu/nvgpu/gp106/hal_gp106.c @@ -27,6 +27,10 @@ #include "common/ptimer/ptimer_gk20a.h" #include "common/bus/bus_gm20b.h" #include "common/bus/bus_gp10b.h" +#include "common/fb/fb_gk20a.h" +#include "common/fb/fb_gp10b.h" +#include "common/fb/fb_gm20b.h" +#include "common/fb/fb_gp106.h" #include "gk20a/gk20a.h" #include "gk20a/fifo_gk20a.h" @@ -37,7 +41,6 @@ #include "gk20a/flcn_gk20a.h" #include "gk20a/regops_gk20a.h" #include "gk20a/mc_gk20a.h" -#include "gk20a/fb_gk20a.h" #include "gk20a/pmu_gk20a.h" #include "gk20a/gr_gk20a.h" @@ -50,7 +53,6 @@ #include "gp10b/regops_gp10b.h" #include "gp10b/priv_ring_gp10b.h" #include "gp10b/fifo_gp10b.h" -#include "gp10b/fb_gp10b.h" #include "gp10b/pmu_gp10b.h" #include "gp10b/gr_gp10b.h" #include "gp10b/priv_ring_gp10b.h" @@ -63,7 +65,6 @@ #include "gm20b/fifo_gm20b.h" #include "gm20b/mm_gm20b.h" #include "gm20b/pmu_gm20b.h" -#include "gm20b/fb_gm20b.h" #include "gm20b/acr_gm20b.h" #include "gm20b/gr_gm20b.h" @@ -81,7 +82,6 @@ #include "gp106/pmu_gp106.h" #include "gp106/gr_ctx_gp106.h" #include "gp106/gr_gp106.h" -#include "gp106/fb_gp106.h" #include "gp106/flcn_gp106.h" #include "gp106/fuse_gp106.h" diff --git a/drivers/gpu/nvgpu/gp10b/hal_gp10b.c b/drivers/gpu/nvgpu/gp10b/hal_gp10b.c index a40608dff..bbfce287a 100644 --- a/drivers/gpu/nvgpu/gp10b/hal_gp10b.c +++ b/drivers/gpu/nvgpu/gp10b/hal_gp10b.c @@ -27,6 +27,9 @@ #include "common/ptimer/ptimer_gk20a.h" #include "common/bus/bus_gm20b.h" #include "common/bus/bus_gp10b.h" +#include "common/fb/fb_gk20a.h" +#include "common/fb/fb_gm20b.h" +#include "common/fb/fb_gp10b.h" #include "gk20a/gk20a.h" #include "gk20a/fifo_gk20a.h" @@ -37,7 +40,6 @@ #include "gk20a/flcn_gk20a.h" #include "gk20a/regops_gk20a.h" #include "gk20a/mc_gk20a.h" -#include "gk20a/fb_gk20a.h" #include "gk20a/pmu_gk20a.h" #include "gk20a/gr_gk20a.h" #include "gk20a/tsg_gk20a.h" @@ -48,7 +50,6 @@ #include "gp10b/ltc_gp10b.h" #include "gp10b/mm_gp10b.h" #include "gp10b/ce_gp10b.h" -#include "gp10b/fb_gp10b.h" #include "gp10b/pmu_gp10b.h" #include "gp10b/gr_ctx_gp10b.h" #include "gp10b/fifo_gp10b.h" @@ -62,7 +63,6 @@ #include "gm20b/acr_gm20b.h" #include "gm20b/pmu_gm20b.h" #include "gm20b/clk_gm20b.h" -#include "gm20b/fb_gm20b.h" #include "gm20b/mm_gm20b.h" #include "gp10b.h" diff --git a/drivers/gpu/nvgpu/gv100/hal_gv100.c b/drivers/gpu/nvgpu/gv100/hal_gv100.c index 9c3eb91ab..6f340e6a9 100644 --- a/drivers/gpu/nvgpu/gv100/hal_gv100.c +++ b/drivers/gpu/nvgpu/gv100/hal_gv100.c @@ -27,6 +27,11 @@ #include "common/bus/bus_gv100.h" #include "common/clock_gating/gv100_gating_reglist.h" #include "common/ptimer/ptimer_gk20a.h" +#include "common/fb/fb_gk20a.h" +#include "common/fb/fb_gm20b.h" +#include "common/fb/fb_gp10b.h" +#include "common/fb/fb_gv11b.h" +#include "common/fb/fb_gv100.h" #include "gk20a/gk20a.h" #include "gk20a/fifo_gk20a.h" @@ -36,7 +41,6 @@ #include "gk20a/dbg_gpu_gk20a.h" #include "gk20a/flcn_gk20a.h" #include "gk20a/regops_gk20a.h" -#include "gk20a/fb_gk20a.h" #include "gk20a/mm_gk20a.h" #include "gk20a/pmu_gk20a.h" #include "gk20a/gr_gk20a.h" @@ -44,7 +48,6 @@ #include "gm20b/ltc_gm20b.h" #include "gm20b/gr_gm20b.h" #include "gm20b/fifo_gm20b.h" -#include "gm20b/fb_gm20b.h" #include "gm20b/mm_gm20b.h" #include "gm20b/pmu_gm20b.h" #include "gm20b/acr_gm20b.h" @@ -60,7 +63,6 @@ #include "gp106/clk_gp106.h" #include "gp106/flcn_gp106.h" -#include "gp10b/fb_gp10b.h" #include "gp10b/gr_gp10b.h" #include "gp10b/ltc_gp10b.h" #include "gp10b/therm_gp10b.h" @@ -82,7 +84,6 @@ #include "gv11b/ce_gv11b.h" #include "gv11b/mm_gv11b.h" #include "gv11b/pmu_gv11b.h" -#include "gv11b/fb_gv11b.h" #include "gv11b/pmu_gv11b.h" #include "gv11b/fifo_gv11b.h" #include "gv11b/regops_gv11b.h" @@ -91,7 +92,6 @@ #include "gv100.h" #include "hal_gv100.h" #include "gv100/bios_gv100.h" -#include "gv100/fb_gv100.h" #include "gv100/fifo_gv100.h" #include "gv100/flcn_gv100.h" #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 3d6f0bd3b..46af100a0 100644 --- a/drivers/gpu/nvgpu/gv100/mc_gv100.c +++ b/drivers/gpu/nvgpu/gv100/mc_gv100.c @@ -29,7 +29,6 @@ #include "gp10b/mc_gp10b.h" #include "mc_gv100.h" -#include "gv11b/fb_gv11b.h" #include @@ -41,7 +40,6 @@ void mc_gv100_intr_enable(struct gk20a *g) 0xffffffffU); gk20a_writel(g, mc_intr_en_clear_r(NVGPU_MC_INTR_NONSTALLING), 0xffffffffU); - g->mc_intr_mask_restore[NVGPU_MC_INTR_STALLING] = mc_intr_pfifo_pending_f() | mc_intr_hub_pending_f() | diff --git a/drivers/gpu/nvgpu/gv11b/hal_gv11b.c b/drivers/gpu/nvgpu/gv11b/hal_gv11b.c index 09f74042a..325285a64 100644 --- a/drivers/gpu/nvgpu/gv11b/hal_gv11b.c +++ b/drivers/gpu/nvgpu/gv11b/hal_gv11b.c @@ -27,6 +27,10 @@ #include "common/bus/bus_gm20b.h" #include "common/clock_gating/gv11b_gating_reglist.h" #include "common/ptimer/ptimer_gk20a.h" +#include "common/fb/fb_gk20a.h" +#include "common/fb/fb_gm20b.h" +#include "common/fb/fb_gp10b.h" +#include "common/fb/fb_gv11b.h" #include "gk20a/gk20a.h" #include "gk20a/fifo_gk20a.h" @@ -37,13 +41,11 @@ #include "gk20a/dbg_gpu_gk20a.h" #include "gk20a/flcn_gk20a.h" #include "gk20a/regops_gk20a.h" -#include "gk20a/fb_gk20a.h" #include "gk20a/pmu_gk20a.h" #include "gk20a/gr_gk20a.h" #include "gm20b/ltc_gm20b.h" #include "gm20b/gr_gm20b.h" -#include "gm20b/fb_gm20b.h" #include "gm20b/fifo_gm20b.h" #include "gm20b/mm_gm20b.h" #include "gm20b/acr_gm20b.h" @@ -56,7 +58,6 @@ #include "gp10b/priv_ring_gp10b.h" #include "gp10b/fifo_gp10b.h" #include "gp10b/fecs_trace_gp10b.h" -#include "gp10b/fb_gp10b.h" #include "gp10b/mm_gp10b.h" #include "gp10b/pmu_gp10b.h" #include "gp10b/gr_gp10b.h" @@ -79,7 +80,6 @@ #include "mm_gv11b.h" #include "pmu_gv11b.h" #include "acr_gv11b.h" -#include "fb_gv11b.h" #include "fifo_gv11b.h" #include "regops_gv11b.h" #include "subctx_gv11b.h" diff --git a/drivers/gpu/nvgpu/gv11b/mc_gv11b.c b/drivers/gpu/nvgpu/gv11b/mc_gv11b.c index b7a3ce62b..64680fc60 100644 --- a/drivers/gpu/nvgpu/gv11b/mc_gv11b.c +++ b/drivers/gpu/nvgpu/gv11b/mc_gv11b.c @@ -29,7 +29,6 @@ #include "gp10b/mc_gp10b.h" #include "mc_gv11b.h" -#include "fb_gv11b.h" #include diff --git a/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_hal_gp10b.c b/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_hal_gp10b.c index 349548cd3..421f36927 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 @@ #include "common/bus/bus_gk20a.h" #include "common/bus/bus_gm20b.h" #include "common/clock_gating/gp10b_gating_reglist.h" +#include "common/fb/fb_gk20a.h" +#include "common/fb/fb_gm20b.h" +#include "common/fb/fb_gp10b.h" #include "vgpu/fifo_vgpu.h" #include "vgpu/gr_vgpu.h" @@ -40,14 +43,12 @@ #include "gk20a/flcn_gk20a.h" #include "gk20a/mc_gk20a.h" -#include "gk20a/fb_gk20a.h" #include "gk20a/dbg_gpu_gk20a.h" #include "gp10b/mc_gp10b.h" #include "gp10b/ltc_gp10b.h" #include "gp10b/mm_gp10b.h" #include "gp10b/ce_gp10b.h" -#include "gp10b/fb_gp10b.h" #include "gp10b/pmu_gp10b.h" #include "gp10b/gr_gp10b.h" #include "gp10b/gr_ctx_gp10b.h" @@ -61,7 +62,6 @@ #include "gm20b/fifo_gm20b.h" #include "gm20b/acr_gm20b.h" #include "gm20b/pmu_gm20b.h" -#include "gm20b/fb_gm20b.h" #include "gm20b/mm_gm20b.h" #include diff --git a/drivers/gpu/nvgpu/vgpu/gv11b/vgpu_hal_gv11b.c b/drivers/gpu/nvgpu/vgpu/gv11b/vgpu_hal_gv11b.c index 577c8f6ed..38f9a1840 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 @@ #include "common/bus/bus_gk20a.h" #include "common/bus/bus_gm20b.h" #include "common/clock_gating/gv11b_gating_reglist.h" +#include "common/fb/fb_gk20a.h" +#include "common/fb/fb_gm20b.h" +#include "common/fb/fb_gp10b.h" +#include "common/fb/fb_gv11b.h" #include #include @@ -40,20 +44,17 @@ #include "vgpu/gp10b/vgpu_mm_gp10b.h" #include "vgpu/gp10b/vgpu_gr_gp10b.h" -#include #include #include #include "gk20a/dbg_gpu_gk20a.h" #include -#include #include #include #include #include #include -#include #include #include #include @@ -67,7 +68,6 @@ #include #include -#include #include #include #include