diff options
author | Terje Bergstrom <tbergstrom@nvidia.com> | 2014-11-12 07:22:35 -0500 |
---|---|---|
committer | Dan Willemsen <dwillemsen@nvidia.com> | 2015-03-18 15:12:19 -0400 |
commit | 2d71d633cf754e15c5667215c44086080c7c328d (patch) | |
tree | 62e64ee0c4aa8128abc66fa83a66c1dd678965b3 /drivers/gpu/nvgpu/gm20b | |
parent | 1deb73b9c6512c6f0a296e35145c49233ea47f74 (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/gm20b')
-rw-r--r-- | drivers/gpu/nvgpu/gm20b/acr_gm20b.c | 3 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gm20b/mm_gm20b.c | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/drivers/gpu/nvgpu/gm20b/acr_gm20b.c b/drivers/gpu/nvgpu/gm20b/acr_gm20b.c index 470a93bc..cb874a48 100644 --- a/drivers/gpu/nvgpu/gm20b/acr_gm20b.c +++ b/drivers/gpu/nvgpu/gm20b/acr_gm20b.c | |||
@@ -258,7 +258,8 @@ int prepare_ucode_blob(struct gk20a *g) | |||
258 | gm20b_dbg_pmu("managed LS falcon %d, WPR size %d bytes.\n", | 258 | gm20b_dbg_pmu("managed LS falcon %d, WPR size %d bytes.\n", |
259 | plsfm->managed_flcn_cnt, plsfm->wpr_size); | 259 | plsfm->managed_flcn_cnt, plsfm->wpr_size); |
260 | lsfm_init_wpr_contents(g, plsfm, nonwpr_addr); | 260 | lsfm_init_wpr_contents(g, plsfm, nonwpr_addr); |
261 | g->acr.ucode_blob_start = NV_MC_SMMU_VADDR_TRANSLATE(iova); | 261 | g->acr.ucode_blob_start = |
262 | gk20a_mm_smmu_vaddr_translate(g, iova); | ||
262 | g->acr.ucode_blob_size = plsfm->wpr_size; | 263 | g->acr.ucode_blob_size = plsfm->wpr_size; |
263 | gm20b_dbg_pmu("base reg carveout 2:%x\n", | 264 | gm20b_dbg_pmu("base reg carveout 2:%x\n", |
264 | readl(mc + MC_SECURITY_CARVEOUT2_BOM_0)); | 265 | readl(mc + MC_SECURITY_CARVEOUT2_BOM_0)); |
diff --git a/drivers/gpu/nvgpu/gm20b/mm_gm20b.c b/drivers/gpu/nvgpu/gm20b/mm_gm20b.c index 678ef4fd..0113e227 100644 --- a/drivers/gpu/nvgpu/gm20b/mm_gm20b.c +++ b/drivers/gpu/nvgpu/gm20b/mm_gm20b.c | |||
@@ -301,4 +301,5 @@ void gm20b_init_mm(struct gpu_ops *gops) | |||
301 | gops->mm.tlb_invalidate = gk20a_mm_tlb_invalidate; | 301 | gops->mm.tlb_invalidate = gk20a_mm_tlb_invalidate; |
302 | gops->mm.set_big_page_size = gm20b_mm_set_big_page_size; | 302 | gops->mm.set_big_page_size = gm20b_mm_set_big_page_size; |
303 | gops->mm.get_big_page_sizes = gm20b_mm_get_big_page_sizes; | 303 | gops->mm.get_big_page_sizes = gm20b_mm_get_big_page_sizes; |
304 | gops->mm.get_physical_addr_bits = gk20a_mm_get_physical_addr_bits; | ||
304 | } | 305 | } |