From f8399cfa553b6fb6d82c7fa762c372f03bf59d5f Mon Sep 17 00:00:00 2001 From: Sunny He Date: Fri, 11 Aug 2017 14:41:33 -0700 Subject: Revert "gpu: nvgpu: Reorg mm HAL initialization" Conflicts with gv100 changes This reverts commit 8d63cd3995d4a650b478ad69d7e29ed2b1b2d927. Change-Id: Ie2f88d281b2b87a9a794d79164a61c4d883626b7 Signed-off-by: Sunny He Reviewed-on: https://git-master.nvidia.com/r/1537668 Reviewed-by: Shu Zhong Tested-by: Shu Zhong --- drivers/gpu/nvgpu/gm20b/mm_gm20b.c | 33 ++++++++++++++++++++++++++++----- 1 file changed, 28 insertions(+), 5 deletions(-) (limited to 'drivers/gpu/nvgpu/gm20b/mm_gm20b.c') diff --git a/drivers/gpu/nvgpu/gm20b/mm_gm20b.c b/drivers/gpu/nvgpu/gm20b/mm_gm20b.c index 05752f03..bbcd6314 100644 --- a/drivers/gpu/nvgpu/gm20b/mm_gm20b.c +++ b/drivers/gpu/nvgpu/gm20b/mm_gm20b.c @@ -20,7 +20,7 @@ #include #include -void gm20b_mm_set_big_page_size(struct gk20a *g, +static void gm20b_mm_set_big_page_size(struct gk20a *g, struct nvgpu_mem *mem, int size) { u32 val; @@ -40,22 +40,22 @@ void gm20b_mm_set_big_page_size(struct gk20a *g, gk20a_dbg_fn("done"); } -u32 gm20b_mm_get_big_page_sizes(void) +static u32 gm20b_mm_get_big_page_sizes(void) { return SZ_64K | SZ_128K; } -u32 gm20b_mm_get_default_big_page_size(void) +static u32 gm20b_mm_get_default_big_page_size(void) { return SZ_128K; } -bool gm20b_mm_support_sparse(struct gk20a *g) +static bool gm20b_mm_support_sparse(struct gk20a *g) { return true; } -bool gm20b_mm_is_bar1_supported(struct gk20a *g) +static bool gm20b_mm_is_bar1_supported(struct gk20a *g) { return true; } @@ -65,3 +65,26 @@ u64 gm20b_gpu_phys_addr(struct gk20a *g, { return phys; } + +void gm20b_init_mm(struct gpu_ops *gops) +{ + gops->mm.support_sparse = gm20b_mm_support_sparse; + gops->mm.gmmu_map = gk20a_locked_gmmu_map; + gops->mm.gmmu_unmap = gk20a_locked_gmmu_unmap; + gops->mm.vm_bind_channel = gk20a_vm_bind_channel; + gops->mm.fb_flush = gk20a_mm_fb_flush; + gops->mm.l2_invalidate = gk20a_mm_l2_invalidate; + gops->mm.l2_flush = gk20a_mm_l2_flush; + gops->mm.cbc_clean = gk20a_mm_cbc_clean; + gops->mm.set_big_page_size = gm20b_mm_set_big_page_size; + gops->mm.get_big_page_sizes = gm20b_mm_get_big_page_sizes; + gops->mm.get_default_big_page_size = gm20b_mm_get_default_big_page_size; + gops->mm.gpu_phys_addr = gm20b_gpu_phys_addr; + gops->mm.get_physical_addr_bits = gk20a_mm_get_physical_addr_bits; + gops->mm.get_mmu_levels = gk20a_mm_get_mmu_levels; + gops->mm.init_pdb = gk20a_mm_init_pdb; + gops->mm.init_mm_setup_hw = gk20a_init_mm_setup_hw; + gops->mm.is_bar1_supported = gm20b_mm_is_bar1_supported; + gops->mm.init_inst_block = gk20a_init_inst_block; + gops->mm.mmu_fault_pending = gk20a_fifo_mmu_fault_pending; +} -- cgit v1.2.2