diff options
author | Terje Bergstrom <tbergstrom@nvidia.com> | 2018-05-25 13:43:01 -0400 |
---|---|---|
committer | Tejal Kudav <tkudav@nvidia.com> | 2018-06-14 09:44:07 -0400 |
commit | d4dfa63e6c324430ad2cac4fabb73a95858b2573 (patch) | |
tree | 1a4816e148827901ac1d23a6fbdf2729d1633469 /drivers/gpu/nvgpu/gv11b/mm_gv11b.c | |
parent | 27694ca572c4d7698b107c6713f0f0604b41c186 (diff) |
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 <tbergstrom@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1730897
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/gv11b/mm_gv11b.c')
-rw-r--r-- | drivers/gpu/nvgpu/gv11b/mm_gv11b.c | 10 |
1 files changed, 1 insertions, 9 deletions
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) | |||
232 | 232 | ||
233 | nvgpu_log_fn(g, " "); | 233 | nvgpu_log_fn(g, " "); |
234 | 234 | ||
235 | g->ops.fb.set_mmu_page_size(g); | 235 | err = gk20a_init_mm_setup_hw(g); |
236 | g->ops.fb.init_hw(g); | ||
237 | |||
238 | err = g->ops.bus.bar2_bind(g, &g->mm.bar2.inst_block); | ||
239 | if (err) | ||
240 | return err; | ||
241 | |||
242 | if (gk20a_mm_fb_flush(g) || gk20a_mm_fb_flush(g)) | ||
243 | return -EBUSY; | ||
244 | 236 | ||
245 | err = gv11b_mm_mmu_fault_setup_sw(g); | 237 | err = gv11b_mm_mmu_fault_setup_sw(g); |
246 | if (!err) | 238 | if (!err) |