From c86f185d1022de18a1a1073aa91d2b06aa59e2fc Mon Sep 17 00:00:00 2001 From: Terje Bergstrom Date: Thu, 16 Aug 2018 14:47:01 -0700 Subject: gpu: nvgpu: Move programming of debug page to FB Debug page was allocated and programmed to HUB MMU in GR code. This introduces a dependency from GR to FB and is anyway the wrong place. Move the code to allocate memory to generic MM code, and the code to program the addresses to FB. Change-Id: Ib6d3c96efde6794cf5e8cd4c908525c85b57c233 Signed-off-by: Terje Bergstrom Reviewed-on: https://git-master.nvidia.com/r/1801423 Reviewed-by: svc-misra-checker GVS: Gerrit_Virtual_Submit Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/common/fb/fb_gm20b.c | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) (limited to 'drivers/gpu/nvgpu/common/fb') diff --git a/drivers/gpu/nvgpu/common/fb/fb_gm20b.c b/drivers/gpu/nvgpu/common/fb/fb_gm20b.c index 65b7336c..00d0fba4 100644 --- a/drivers/gpu/nvgpu/common/fb/fb_gm20b.c +++ b/drivers/gpu/nvgpu/common/fb/fb_gm20b.c @@ -55,9 +55,32 @@ void gm20b_fb_reset(struct gk20a *g) void gm20b_fb_init_hw(struct gk20a *g) { - u32 addr = nvgpu_mem_get_addr(g, &g->mm.sysmem_flush) >> 8; + u64 addr = nvgpu_mem_get_addr(g, &g->mm.sysmem_flush) >> 8; gk20a_writel(g, fb_niso_flush_sysmem_addr_r(), addr); + + /* init mmu debug buffer */ + addr = nvgpu_mem_get_addr(g, &g->mm.mmu_wr_mem); + addr >>= fb_mmu_debug_wr_addr_alignment_v(); + + gk20a_writel(g, fb_mmu_debug_wr_r(), + nvgpu_aperture_mask(g, &g->mm.mmu_wr_mem, + fb_mmu_debug_wr_aperture_sys_mem_ncoh_f(), + fb_mmu_debug_wr_aperture_sys_mem_coh_f(), + fb_mmu_debug_wr_aperture_vid_mem_f()) | + fb_mmu_debug_wr_vol_false_f() | + fb_mmu_debug_wr_addr_f(addr)); + + addr = nvgpu_mem_get_addr(g, &g->mm.mmu_rd_mem); + addr >>= fb_mmu_debug_rd_addr_alignment_v(); + + gk20a_writel(g, fb_mmu_debug_rd_r(), + nvgpu_aperture_mask(g, &g->mm.mmu_rd_mem, + fb_mmu_debug_wr_aperture_sys_mem_ncoh_f(), + fb_mmu_debug_wr_aperture_sys_mem_coh_f(), + fb_mmu_debug_rd_aperture_vid_mem_f()) | + fb_mmu_debug_rd_vol_false_f() | + fb_mmu_debug_rd_addr_f(addr)); } int gm20b_fb_tlb_invalidate(struct gk20a *g, struct nvgpu_mem *pdb) -- cgit v1.2.2