Revert "gpu: nvgpu: Reorg fb HAL initialization"

Conflicts with gv100 changes

This reverts commit 63b74d4b768e0c96367d4983fdd8f1db1d317d01.

Change-Id: I5e6a1c93ff613daaa100dee436f4941af74f0ac4
Signed-off-by: Sunny He <suhe@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1537671
Reviewed-by: Shu Zhong <shuz@nvidia.com>
Tested-by: Shu Zhong <shuz@nvidia.com>

1 files changed, 14 insertions, 4 deletions

diff --git a/drivers/gpu/nvgpu/gp10b/fb_gp10b.c b/drivers/gpu/nvgpu/gp10b/fb_gp10b.c
index 775dc5c9..8ba9ff8e 100644
--- a/drivers/gpu/nvgpu/gp10b/fb_gp10b.c
+++ b/drivers/gpu/nvgpu/gp10b/fb_gp10b.c
@@ -20,7 +20,7 @@
 
 #include <nvgpu/hw/gp10b/hw_gmmu_gp10b.h>
 
-noinline_for_stack void gp10b_init_uncompressed_kind_map(void)
+static noinline_for_stack void gp10b_init_uncompressed_kind_map(void)
 {
         int i;
 
@@ -438,7 +438,7 @@ static noinline_for_stack bool gp10b_kind_zbc(u8 k)
                         k <= gmmu_pte_kind_c128_ms8_ms16_2cr_v());
 }
 
-void gp10b_init_kind_attr(void)
+static void gp10b_init_kind_attr(void)
 {
         u16 k;
 
@@ -456,12 +456,22 @@ void gp10b_init_kind_attr(void)
         }
 }
 
-unsigned int gp10b_fb_compression_page_size(struct gk20a *g)
+static unsigned int gp10b_fb_compression_page_size(struct gk20a *g)
 {
         return SZ_64K;
 }
 
-unsigned int gp10b_fb_compressible_page_size(struct gk20a *g)
+static unsigned int gp10b_fb_compressible_page_size(struct gk20a *g)
 {
         return SZ_4K;
 }
+
+void gp10b_init_fb(struct gpu_ops *gops)
+{
+        gm20b_init_fb(gops);
+        gops->fb.compression_page_size = gp10b_fb_compression_page_size;
+        gops->fb.compressible_page_size = gp10b_fb_compressible_page_size;
+
+        gp10b_init_uncompressed_kind_map();
+        gp10b_init_kind_attr();
+}