gpu: nvgpu: Move FB to common

Move all FB HAL implementations to common/fb.

JIRA NVGPU-596

Change-Id: Id4ea09d608f5d6d1b245bddac09ecf1444b8ab30
Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1769724
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>

2 files changed, 7 insertions, 7 deletions

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 @@
 #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 <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 @@
 #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 <gk20a/gk20a.h>
 #include <gv11b/hal_gv11b.h>
@@ -40,20 +44,17 @@
 #include "vgpu/gp10b/vgpu_mm_gp10b.h"
 #include "vgpu/gp10b/vgpu_gr_gp10b.h"
 
-#include <gk20a/fb_gk20a.h>
 #include <gk20a/flcn_gk20a.h>
 #include <gk20a/mc_gk20a.h>
 #include "gk20a/dbg_gpu_gk20a.h"
 
 #include <gm20b/gr_gm20b.h>
-#include <gm20b/fb_gm20b.h>
 #include <gm20b/fifo_gm20b.h>
 #include <gm20b/pmu_gm20b.h>
 #include <gm20b/mm_gm20b.h>
 #include <gm20b/acr_gm20b.h>
 #include <gm20b/ltc_gm20b.h>
 
-#include <gp10b/fb_gp10b.h>
 #include <gp10b/pmu_gp10b.h>
 #include <gp10b/mm_gp10b.h>
 #include <gp10b/mc_gp10b.h>
@@ -67,7 +68,6 @@
 #include <gp106/pmu_gp106.h>
 #include <gp106/acr_gp106.h>
 
-#include <gv11b/fb_gv11b.h>
 #include <gv11b/pmu_gv11b.h>
 #include <gv11b/acr_gv11b.h>
 #include <gv11b/mm_gv11b.h>