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/gp10b/mm_gp10b.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/gp10b/mm_gp10b.c')
-rw-r--r-- | drivers/gpu/nvgpu/gp10b/mm_gp10b.c | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/drivers/gpu/nvgpu/gp10b/mm_gp10b.c b/drivers/gpu/nvgpu/gp10b/mm_gp10b.c index 50c96f36..54772d42 100644 --- a/drivers/gpu/nvgpu/gp10b/mm_gp10b.c +++ b/drivers/gpu/nvgpu/gp10b/mm_gp10b.c | |||
@@ -46,37 +46,6 @@ u32 gp10b_mm_get_iommu_bit(struct gk20a *g) | |||
46 | return 36; | 46 | return 36; |
47 | } | 47 | } |
48 | 48 | ||
49 | int gp10b_init_mm_setup_hw(struct gk20a *g) | ||
50 | { | ||
51 | struct mm_gk20a *mm = &g->mm; | ||
52 | struct nvgpu_mem *inst_block = &mm->bar1.inst_block; | ||
53 | int err = 0; | ||
54 | |||
55 | nvgpu_log_fn(g, " "); | ||
56 | |||
57 | g->ops.fb.set_mmu_page_size(g); | ||
58 | |||
59 | gk20a_writel(g, fb_niso_flush_sysmem_addr_r(), | ||
60 | nvgpu_mem_get_addr(g, &g->mm.sysmem_flush) >> 8ULL); | ||
61 | |||
62 | g->ops.bus.bar1_bind(g, inst_block); | ||
63 | |||
64 | if (g->ops.bus.bar2_bind) { | ||
65 | err = g->ops.bus.bar2_bind(g, &g->mm.bar2.inst_block); | ||
66 | if (err) | ||
67 | return err; | ||
68 | } | ||
69 | |||
70 | if (gk20a_mm_fb_flush(g) || gk20a_mm_fb_flush(g)) | ||
71 | return -EBUSY; | ||
72 | |||
73 | err = gp10b_replayable_pagefault_buffer_init(g); | ||
74 | |||
75 | nvgpu_log_fn(g, "done"); | ||
76 | return err; | ||
77 | |||
78 | } | ||
79 | |||
80 | int gp10b_init_bar2_vm(struct gk20a *g) | 49 | int gp10b_init_bar2_vm(struct gk20a *g) |
81 | { | 50 | { |
82 | int err; | 51 | int err; |