gpu: nvgpu: Reorg fb HAL initialization

Reorganize HAL initialization to remove inheritance and construct
the gpu_ops struct at compile time. This patch only covers the
fb sub-module of the gpu_ops struct.

Perform HAL function assignments in hal_gxxxx.c through the
population of a chip-specific copy of gpu_ops.

Jira NVGPU-74

Change-Id: I3fdbf6059ef664caf8d33797a8a5f3f8eb6485bf
Signed-off-by: Sunny He <suhe@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1537748
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>

1 files changed, 1 insertions, 8 deletions

diff --git a/drivers/gpu/nvgpu/gv100/fb_gv100.c b/drivers/gpu/nvgpu/gv100/fb_gv100.c
index a3785266..319ebad6 100644
--- a/drivers/gpu/nvgpu/gv100/fb_gv100.c
+++ b/drivers/gpu/nvgpu/gv100/fb_gv100.c
@@ -21,7 +21,6 @@
 #include <nvgpu/gmmu.h>
 
 #include "gk20a/gk20a.h"
-#include "gv11b/fb_gv11b.h"
 #include "gv100/fb_gv100.h"
 
 #include <nvgpu/hw/gv100/hw_fb_gv100.h>
@@ -29,7 +28,7 @@
 #define HW_SCRUB_TIMEOUT_DEFAULT        100 /* usec */
 #define HW_SCRUB_TIMEOUT_MAX            2000000 /* usec */
 
-static void gv100_fb_reset(struct gk20a *g)
+void gv100_fb_reset(struct gk20a *g)
 {
         u32 val;
         int retries = HW_SCRUB_TIMEOUT_MAX / HW_SCRUB_TIMEOUT_DEFAULT;
@@ -50,9 +49,3 @@ static void gv100_fb_reset(struct gk20a *g)
         val &= ~fb_mmu_priv_level_mask_write_violation_m();
         gk20a_writel(g, fb_mmu_priv_level_mask_r(), val);
 }
-
-void gv100_init_fb(struct gpu_ops *gops)
-{
-        gv11b_init_fb(gops);
-        gops->fb.reset = gv100_fb_reset;
-}