Revert "gpu: nvgpu: gv11b: Reorg fb HAL initialization"

Conflicts with gv100 changes

This reverts commit da8e67f042760d54f3d6b5f84abbd9981d9fcd54.

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

1 files changed, 2 insertions, 9 deletions

diff --git a/drivers/gpu/nvgpu/gv11b/fb_gv11b.h b/drivers/gpu/nvgpu/gv11b/fb_gv11b.h
index 3e2dd828..39cdfb77 100644
--- a/drivers/gpu/nvgpu/gv11b/fb_gv11b.h
+++ b/drivers/gpu/nvgpu/gv11b/fb_gv11b.h
@@ -42,13 +42,9 @@
 #define FAULT_TYPE_OTHER_AND_NONREPLAY          0
 #define FAULT_TYPE_REPLAY                       1
 
-struct gk20a;
-
-void gv11b_fb_init_fs_state(struct gk20a *g);
-void gv11b_fb_init_cbc(struct gk20a *g, struct gr_gk20a *gr);
-void gv11b_fb_reset(struct gk20a *g);
-void gv11b_fb_hub_isr(struct gk20a *g);
+struct gpu_ops;
 
+void gv11b_init_fb(struct gpu_ops *gops);
 u32 gv11b_fb_is_fault_buf_enabled(struct gk20a *g,
                                  unsigned int index);
 void gv11b_fb_fault_buf_set_state_hw(struct gk20a *g,
@@ -60,7 +56,4 @@ void gv11b_fb_disable_hub_intr(struct gk20a *g,
          unsigned int index, unsigned int intr_type);
 void gv11b_fb_fault_buf_configure_hw(struct gk20a *g, unsigned int index);
 bool gv11b_fb_mmu_fault_pending(struct gk20a *g);
-
-noinline_for_stack void gv11b_init_uncompressed_kind_map(void);
-void gv11b_init_kind_attr(void);
 #endif