gpu: nvgpu: fb: Move chip specific fb code to hal

Move chip specific fb code from common to hal folder.

JIRA NVGPU-2034

Change-Id: I1d982a59fa050fb429e0369287e11109232fa4a4
Signed-off-by: Seshendra Gadagottu <sgadagottu@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/2070184
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>

drivers/gpu/nvgpu/Makefile

@@ -35,12 +35,6 @@ obj-$(CONFIG_GK20A) := nvgpu.o
 nvgpu-y += \
 	common/ptimer/ptimer.o \
 	common/ptimer/ptimer_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 \
-	common/fb/fb_tu104.o \
 	common/perf/perf_gm20b.o \
 	common/perf/perf_gv11b.o \
 	common/perf/perfbuf.o \
@@ -190,6 +184,12 @@ nvgpu-y += \
 	hal/ltc/ltc_gp10b.o \
 	hal/ltc/ltc_gv11b.o  \
 	hal/ltc/ltc_tu104.o \
+	hal/fb/fb_gm20b.o \
+	hal/fb/fb_gp10b.o \
+	hal/fb/fb_gp106.o \
+	hal/fb/fb_gv11b.o \
+	hal/fb/fb_gv100.o \
+	hal/fb/fb_tu104.o \
 	hal/fuse/fuse_gm20b.o \
 	hal/fuse/fuse_gp10b.o \
 	hal/fuse/fuse_gp106.o \

drivers/gpu/nvgpu/Makefile.sources

@@ -77,11 +77,6 @@ srcs += common/sim.c \
 	common/mm/mm.c \
 	common/mm/dma.c \
 	common/mm/vidmem.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/init/hal_init.c \
 	common/xve/xve_gp106.c \
 	common/therm/therm.c \
@@ -291,7 +286,6 @@ srcs += common/sim.c \
 	gv100/hal_gv100.c \
 	gv100/gsp_gv100.c \
 	gv100/clk_gv100.c \
-	common/fb/fb_tu104.c	\
 	common/mc/mc_tu104.c	\
 	tu104/bios_tu104.c	\
 	tu104/ecc_tu104.c	\
@@ -355,6 +349,12 @@ srcs += common/sim.c \
 	hal/ltc/ltc_gp10b.c \
 	hal/ltc/ltc_gv11b.c  \
 	hal/ltc/ltc_tu104.c	\
+	hal/fb/fb_gm20b.c \
+	hal/fb/fb_gp10b.c \
+	hal/fb/fb_gp106.c \
+	hal/fb/fb_gv100.c \
+	hal/fb/fb_gv11b.c \
+	hal/fb/fb_tu104.c	\
 	hal/fuse/fuse_gm20b.c \
 	hal/fuse/fuse_gp10b.c \
 	hal/fuse/fuse_gp106.c \

drivers/gpu/nvgpu/common/vgpu/gp10b/vgpu_hal_gp10b.c

@@ -27,9 +27,9 @@
 #include "hal/therm/therm_gp10b.h"
 #include "hal/ltc/ltc_gm20b.h"
 #include "hal/ltc/ltc_gp10b.h"
+#include "hal/fb/fb_gm20b.h"
+#include "hal/fb/fb_gp10b.h"
 
-#include "common/fb/fb_gm20b.h"
-#include "common/fb/fb_gp10b.h"
 #include "common/netlist/netlist_gp10b.h"
 #include "common/gr/ctxsw_prog/ctxsw_prog_gm20b.h"
 #include "common/gr/ctxsw_prog/ctxsw_prog_gp10b.h"

drivers/gpu/nvgpu/common/vgpu/gv11b/vgpu_hal_gv11b.c

@@ -31,10 +31,10 @@
 #include "hal/ltc/ltc_gm20b.h"
 #include "hal/ltc/ltc_gp10b.h"
 #include "hal/ltc/ltc_gv11b.h"
+#include "hal/fb/fb_gm20b.h"
+#include "hal/fb/fb_gp10b.h"
+#include "hal/fb/fb_gv11b.h"
 
-#include "common/fb/fb_gm20b.h"
-#include "common/fb/fb_gp10b.h"
-#include "common/fb/fb_gv11b.h"
 #include "common/netlist/netlist_gv11b.h"
 #include "common/gr/ctxsw_prog/ctxsw_prog_gm20b.h"
 #include "common/gr/ctxsw_prog/ctxsw_prog_gp10b.h"

drivers/gpu/nvgpu/gm20b/hal_gm20b.c

@@ -44,6 +44,7 @@
 #include "hal/cbc/cbc_gm20b.h"
 #include "hal/therm/therm_gm20b.h"
 #include "hal/ltc/ltc_gm20b.h"
+#include "hal/fb/fb_gm20b.h"
 #include "hal/fuse/fuse_gm20b.h"
 #include "hal/fifo/engines_gm20b.h"
 #include "hal/gr/zbc/zbc_gm20b.h"
@@ -51,7 +52,6 @@
 #include "hal/falcon/falcon_gk20a.h"
 
 #include "common/ptimer/ptimer_gk20a.h"
-#include "common/fb/fb_gm20b.h"
 #include "common/netlist/netlist_gm20b.h"
 #include "common/gr/ctxsw_prog/ctxsw_prog_gm20b.h"
 #include "common/gr/config/gr_config_gm20b.h"

drivers/gpu/nvgpu/gp10b/hal_gp10b.c

@@ -50,6 +50,8 @@
 #include "hal/therm/therm_gp10b.h"
 #include "hal/ltc/ltc_gm20b.h"
 #include "hal/ltc/ltc_gp10b.h"
+#include "hal/fb/fb_gm20b.h"
+#include "hal/fb/fb_gp10b.h"
 #include "hal/fuse/fuse_gm20b.h"
 #include "hal/fuse/fuse_gp10b.h"
 #include "hal/fifo/engines_gm20b.h"
@@ -59,8 +61,6 @@
 #include "hal/falcon/falcon_gk20a.h"
 
 #include "common/ptimer/ptimer_gk20a.h"
-#include "common/fb/fb_gm20b.h"
-#include "common/fb/fb_gp10b.h"
 #include "common/netlist/netlist_gp10b.h"
 #include "common/gr/ctxsw_prog/ctxsw_prog_gm20b.h"
 #include "common/gr/ctxsw_prog/ctxsw_prog_gp10b.h"

drivers/gpu/nvgpu/gv100/hal_gv100.c

@@ -37,6 +37,11 @@
 #include "hal/ltc/ltc_gm20b.h"
 #include "hal/ltc/ltc_gp10b.h"
 #include "hal/ltc/ltc_gv11b.h"
+#include "hal/fb/fb_gm20b.h"
+#include "hal/fb/fb_gp10b.h"
+#include "hal/fb/fb_gp106.h"
+#include "hal/fb/fb_gv11b.h"
+#include "hal/fb/fb_gv100.h"
 #include "hal/fuse/fuse_gm20b.h"
 #include "hal/fuse/fuse_gp10b.h"
 #include "hal/fuse/fuse_gp106.h"
@@ -48,11 +53,6 @@
 #include "hal/falcon/falcon_gk20a.h"
 
 #include "common/ptimer/ptimer_gk20a.h"
-#include "common/fb/fb_gm20b.h"
-#include "common/fb/fb_gp10b.h"
-#include "common/fb/fb_gp106.h"
-#include "common/fb/fb_gv11b.h"
-#include "common/fb/fb_gv100.h"
 #include "common/xve/xve_gp106.h"
 #include "common/netlist/netlist_gv100.h"
 #include "common/gr/ctxsw_prog/ctxsw_prog_gm20b.h"

drivers/gpu/nvgpu/gv11b/hal_gv11b.c

@@ -40,6 +40,9 @@
 #include "hal/ltc/ltc_gm20b.h"
 #include "hal/ltc/ltc_gp10b.h"
 #include "hal/ltc/ltc_gv11b.h"
+#include "hal/fb/fb_gm20b.h"
+#include "hal/fb/fb_gp10b.h"
+#include "hal/fb/fb_gv11b.h"
 #include "hal/fuse/fuse_gm20b.h"
 #include "hal/fuse/fuse_gp10b.h"
 #include "hal/fifo/engines_gv11b.h"
@@ -51,9 +54,6 @@
 #include "hal/falcon/falcon_gk20a.h"
 
 #include "common/ptimer/ptimer_gk20a.h"
-#include "common/fb/fb_gm20b.h"
-#include "common/fb/fb_gp10b.h"
-#include "common/fb/fb_gv11b.h"
 #include "common/netlist/netlist_gv11b.h"
 #include "common/gr/ctxsw_prog/ctxsw_prog_gm20b.h"
 #include "common/gr/ctxsw_prog/ctxsw_prog_gp10b.h"

drivers/gpu/nvgpu/hal/fb/fb_tu104.c

@@ -30,8 +30,8 @@
 #include <nvgpu/utils.h>
 #include <nvgpu/gk20a.h>
 
-#include "common/fb/fb_gv11b.h"
+#include "hal/fb/fb_gv11b.h"
-#include "common/fb/fb_gv100.h"
+#include "hal/fb/fb_gv100.h"
 #include "common/mc/mc_tu104.h"
 
 #include "tu104/func_tu104.h"

drivers/gpu/nvgpu/tu104/hal_tu104.c

@@ -40,6 +40,12 @@
 #include "hal/ltc/ltc_gp10b.h"
 #include "hal/ltc/ltc_gv11b.h"
 #include "hal/ltc/ltc_tu104.h"
+#include "hal/fb/fb_gm20b.h"
+#include "hal/fb/fb_gp10b.h"
+#include "hal/fb/fb_gp106.h"
+#include "hal/fb/fb_gv11b.h"
+#include "hal/fb/fb_gv100.h"
+#include "hal/fb/fb_tu104.h"
 #include "hal/fuse/fuse_gm20b.h"
 #include "hal/fuse/fuse_gp10b.h"
 #include "hal/fuse/fuse_gp106.h"
@@ -52,12 +58,6 @@
 #include "hal/falcon/falcon_gk20a.h"
 
 #include "common/ptimer/ptimer_gk20a.h"
-#include "common/fb/fb_gm20b.h"
-#include "common/fb/fb_gp10b.h"
-#include "common/fb/fb_gp106.h"
-#include "common/fb/fb_gv11b.h"
-#include "common/fb/fb_gv100.h"
-#include "common/fb/fb_tu104.h"
 #include "common/xve/xve_gp106.h"
 #include "common/netlist/netlist_tu104.h"
 #include "common/gr/ctxsw_prog/ctxsw_prog_gm20b.h"

userspace/units/mm/gmmu/page_table/page_table.c

@@ -38,10 +38,11 @@
 #include <gm20b/mm_gm20b.h>
 #include <gp10b/mm_gp10b.h>
 #include <gv11b/mm_gv11b.h>
-#include <common/fb/fb_gp10b.h>
-#include <common/fb/fb_gm20b.h>
 #include <nvgpu/hw/gv11b/hw_gmmu_gv11b.h>
 
+#include <hal/fb/fb_gp10b.h>
+#include <hal/fb/fb_gm20b.h>
+
 #define TEST_PA_ADDRESS     0xEFAD80000000
 #define TEST_GPU_VA         0x102040600000
 #define TEST_PA_ADDRESS_64K 0x1FAD80010000

userspace/units/mm/page_table_faults/page_table_faults.c

@@ -39,13 +39,14 @@
 #include "gp10b/mm_gp10b.h"
 #include "gv11b/mm_gv11b.h"
 #include "gv11b/fifo_gv11b.h"
-#include "common/fb/fb_gp10b.h"
-#include "common/fb/fb_gm20b.h"
-#include "common/fb/fb_gv11b.h"
 #include "common/fifo/channel_gv11b.h"
 #include "nvgpu/hw/gv11b/hw_gmmu_gv11b.h"
 #include "nvgpu/hw/gv11b/hw_fb_gv11b.h"
 
+#include "hal/fb/fb_gp10b.h"
+#include "hal/fb/fb_gm20b.h"
+#include "hal/fb/fb_gv11b.h"
+
 #define TEST_PA_ADDRESS 0xEFAD80000000
 #define TEST_COMP_TAG 0xEF
 #define TEST_INVALID_ADDRESS 0xAAC0000000

userspace/units/mm/vm/vm.c

@@ -33,8 +33,8 @@
 #include <nvgpu/nvgpu_sgt.h>
 #include <nvgpu/vm_area.h>
 #include <gp10b/mm_gp10b.h>
-#include <common/fb/fb_gp10b.h>
+#include <hal/fb/fb_gp10b.h>
-#include <common/fb/fb_gm20b.h>
+#include <hal/fb/fb_gm20b.h>
 #include <gv11b/mm_gv11b.h>
 #include <nvgpu/hw/gv11b/hw_gmmu_gv11b.h>