summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
diff options
context:
space:
mode:
authorTerje Bergstrom <tbergstrom@nvidia.com>2014-11-12 07:22:35 -0500
committerDan Willemsen <dwillemsen@nvidia.com>2015-03-18 15:12:19 -0400
commit2d71d633cf754e15c5667215c44086080c7c328d (patch)
tree62e64ee0c4aa8128abc66fa83a66c1dd678965b3 /drivers/gpu/nvgpu/gk20a/gr_gk20a.c
parent1deb73b9c6512c6f0a296e35145c49233ea47f74 (diff)
gpu: nvgpu: Physical page bits to be per chip
Retrieve number of physical page bits based on chip. Bug 1567274 Change-Id: I5a0f6a66be37f2cf720d66b5bdb2b704cd992234 Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com> Reviewed-on: http://git-master/r/601700
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a/gr_gk20a.c')
-rw-r--r--drivers/gpu/nvgpu/gk20a/gr_gk20a.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
index 36636d4f..482b3c5f 100644
--- a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
@@ -1734,7 +1734,7 @@ static int gr_gk20a_init_ctxsw_ucode_vaspace(struct gk20a *g)
1734 gk20a_mem_wr32(inst_ptr, ram_in_adr_limit_hi_w(), 1734 gk20a_mem_wr32(inst_ptr, ram_in_adr_limit_hi_w(),
1735 ram_in_adr_limit_hi_f(u64_hi32(vm->va_limit))); 1735 ram_in_adr_limit_hi_f(u64_hi32(vm->va_limit)));
1736 1736
1737 pde_addr = gk20a_mm_iova_addr(vm->pdes.sgt->sgl); 1737 pde_addr = gk20a_mm_iova_addr(g, vm->pdes.sgt->sgl);
1738 pde_addr_lo = u64_lo32(pde_addr >> 12); 1738 pde_addr_lo = u64_lo32(pde_addr >> 12);
1739 pde_addr_hi = u64_hi32(pde_addr); 1739 pde_addr_hi = u64_hi32(pde_addr);
1740 gk20a_mem_wr32(inst_ptr, ram_in_page_dir_base_lo_w(), 1740 gk20a_mem_wr32(inst_ptr, ram_in_page_dir_base_lo_w(),
@@ -4255,7 +4255,7 @@ static int gk20a_init_gr_setup_hw(struct gk20a *g)
4255 gk20a_dbg_fn(""); 4255 gk20a_dbg_fn("");
4256 4256
4257 /* init mmu debug buffer */ 4257 /* init mmu debug buffer */
4258 addr = NV_MC_SMMU_VADDR_TRANSLATE(gr->mmu_wr_mem.iova); 4258 addr = gk20a_mm_smmu_vaddr_translate(g, gr->mmu_wr_mem.iova);
4259 addr >>= fb_mmu_debug_wr_addr_alignment_v(); 4259 addr >>= fb_mmu_debug_wr_addr_alignment_v();
4260 4260
4261 gk20a_writel(g, fb_mmu_debug_wr_r(), 4261 gk20a_writel(g, fb_mmu_debug_wr_r(),
@@ -4263,7 +4263,7 @@ static int gk20a_init_gr_setup_hw(struct gk20a *g)
4263 fb_mmu_debug_wr_vol_false_f() | 4263 fb_mmu_debug_wr_vol_false_f() |
4264 fb_mmu_debug_wr_addr_f(addr)); 4264 fb_mmu_debug_wr_addr_f(addr));
4265 4265
4266 addr = NV_MC_SMMU_VADDR_TRANSLATE(gr->mmu_rd_mem.iova); 4266 addr = gk20a_mm_smmu_vaddr_translate(g, gr->mmu_rd_mem.iova);
4267 addr >>= fb_mmu_debug_rd_addr_alignment_v(); 4267 addr >>= fb_mmu_debug_rd_addr_alignment_v();
4268 4268
4269 gk20a_writel(g, fb_mmu_debug_rd_r(), 4269 gk20a_writel(g, fb_mmu_debug_rd_r(),