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, 3 insertions, 7 deletions

diff --git a/drivers/gpu/nvgpu/gp10b/fb_gp10b.h b/drivers/gpu/nvgpu/gp10b/fb_gp10b.h
index 626cf54d..76efd331 100644
--- a/drivers/gpu/nvgpu/gp10b/fb_gp10b.h
+++ b/drivers/gpu/nvgpu/gp10b/fb_gp10b.h
@@ -1,7 +1,7 @@
 /*
  * GP10B FB
  *
- * Copyright (c) 2014-2017, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2014, NVIDIA CORPORATION.  All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms and conditions of the GNU General Public License,
@@ -15,11 +15,7 @@
 
 #ifndef _NVGPU_GP10B_FB
 #define _NVGPU_GP10B_FB
-struct gk20a;
-
-noinline_for_stack void gp10b_init_uncompressed_kind_map(void);
-void gp10b_init_kind_attr(void);
-unsigned int gp10b_fb_compression_page_size(struct gk20a *g);
-unsigned int gp10b_fb_compressible_page_size(struct gk20a *g);
+struct gpu_ops;
 
+void gp10b_init_fb(struct gpu_ops *gops);
 #endif