From d4dfa63e6c324430ad2cac4fabb73a95858b2573 Mon Sep 17 00:00:00 2001 From: Terje Bergstrom Date: Fri, 25 May 2018 10:43:01 -0700 Subject: gpu: nvgpu: Combine variants of init_mm_setup_hw gp10b and gk20a variants of init_mm_setup_hw were essentially the same. Delete the gp10b version and use gk20a variant instead. gv11b variant now also inherits gk20a variant. JIRA NVGPU-588 Change-Id: I842516a1c0be68562ad0ece6e1837a1416d24957 Signed-off-by: Terje Bergstrom Reviewed-on: https://git-master.nvidia.com/r/1730897 Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/gv11b/mm_gv11b.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'drivers/gpu/nvgpu/gv11b/mm_gv11b.c') diff --git a/drivers/gpu/nvgpu/gv11b/mm_gv11b.c b/drivers/gpu/nvgpu/gv11b/mm_gv11b.c index 6c38365c..e1d90829 100644 --- a/drivers/gpu/nvgpu/gv11b/mm_gv11b.c +++ b/drivers/gpu/nvgpu/gv11b/mm_gv11b.c @@ -232,15 +232,7 @@ int gv11b_init_mm_setup_hw(struct gk20a *g) nvgpu_log_fn(g, " "); - g->ops.fb.set_mmu_page_size(g); - g->ops.fb.init_hw(g); - - err = g->ops.bus.bar2_bind(g, &g->mm.bar2.inst_block); - if (err) - return err; - - if (gk20a_mm_fb_flush(g) || gk20a_mm_fb_flush(g)) - return -EBUSY; + err = gk20a_init_mm_setup_hw(g); err = gv11b_mm_mmu_fault_setup_sw(g); if (!err) -- cgit v1.2.2