diff options
Diffstat (limited to 'drivers/gpu/nvgpu/gm20b')
-rw-r--r-- | drivers/gpu/nvgpu/gm20b/acr_gm20b.c | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gm20b/ltc_gm20b.c | 4 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gm20b/mm_gm20b.c | 1 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gm20b/mm_gm20b.h | 3 |
4 files changed, 6 insertions, 4 deletions
diff --git a/drivers/gpu/nvgpu/gm20b/acr_gm20b.c b/drivers/gpu/nvgpu/gm20b/acr_gm20b.c index 0d69b5da..4fa1b313 100644 --- a/drivers/gpu/nvgpu/gm20b/acr_gm20b.c +++ b/drivers/gpu/nvgpu/gm20b/acr_gm20b.c | |||
@@ -1081,7 +1081,7 @@ static int gm20b_bootstrap_hs_flcn(struct gk20a *g) | |||
1081 | u32 *acr_ucode_header_t210_load; | 1081 | u32 *acr_ucode_header_t210_load; |
1082 | u32 *acr_ucode_data_t210_load; | 1082 | u32 *acr_ucode_data_t210_load; |
1083 | 1083 | ||
1084 | start = g->ops.mm.get_iova_addr(g, acr->ucode_blob.priv.sgt->sgl, 0); | 1084 | start = nvgpu_mem_get_addr(g, &acr->ucode_blob); |
1085 | size = acr->ucode_blob.size; | 1085 | size = acr->ucode_blob.size; |
1086 | 1086 | ||
1087 | gm20b_dbg_pmu(""); | 1087 | gm20b_dbg_pmu(""); |
diff --git a/drivers/gpu/nvgpu/gm20b/ltc_gm20b.c b/drivers/gpu/nvgpu/gm20b/ltc_gm20b.c index 6fef01ea..74c56487 100644 --- a/drivers/gpu/nvgpu/gm20b/ltc_gm20b.c +++ b/drivers/gpu/nvgpu/gm20b/ltc_gm20b.c | |||
@@ -401,8 +401,8 @@ void gm20b_ltc_init_cbc(struct gk20a *g, struct gr_gk20a *gr) | |||
401 | if (nvgpu_is_enabled(g, NVGPU_IS_FMODEL)) | 401 | if (nvgpu_is_enabled(g, NVGPU_IS_FMODEL)) |
402 | compbit_store_iova = gk20a_mem_phys(&gr->compbit_store.mem); | 402 | compbit_store_iova = gk20a_mem_phys(&gr->compbit_store.mem); |
403 | else | 403 | else |
404 | compbit_store_iova = g->ops.mm.get_iova_addr(g, | 404 | compbit_store_iova = nvgpu_mem_get_addr(g, |
405 | gr->compbit_store.mem.priv.sgt->sgl, 0); | 405 | &gr->compbit_store.mem); |
406 | 406 | ||
407 | compbit_base_post_divide64 = compbit_store_iova >> | 407 | compbit_base_post_divide64 = compbit_store_iova >> |
408 | ltc_ltcs_ltss_cbc_base_alignment_shift_v(); | 408 | ltc_ltcs_ltss_cbc_base_alignment_shift_v(); |
diff --git a/drivers/gpu/nvgpu/gm20b/mm_gm20b.c b/drivers/gpu/nvgpu/gm20b/mm_gm20b.c index d436e985..bbcd6314 100644 --- a/drivers/gpu/nvgpu/gm20b/mm_gm20b.c +++ b/drivers/gpu/nvgpu/gm20b/mm_gm20b.c | |||
@@ -80,7 +80,6 @@ void gm20b_init_mm(struct gpu_ops *gops) | |||
80 | gops->mm.get_big_page_sizes = gm20b_mm_get_big_page_sizes; | 80 | gops->mm.get_big_page_sizes = gm20b_mm_get_big_page_sizes; |
81 | gops->mm.get_default_big_page_size = gm20b_mm_get_default_big_page_size; | 81 | gops->mm.get_default_big_page_size = gm20b_mm_get_default_big_page_size; |
82 | gops->mm.gpu_phys_addr = gm20b_gpu_phys_addr; | 82 | gops->mm.gpu_phys_addr = gm20b_gpu_phys_addr; |
83 | gops->mm.get_iova_addr = gk20a_mm_iova_addr; | ||
84 | gops->mm.get_physical_addr_bits = gk20a_mm_get_physical_addr_bits; | 83 | gops->mm.get_physical_addr_bits = gk20a_mm_get_physical_addr_bits; |
85 | gops->mm.get_mmu_levels = gk20a_mm_get_mmu_levels; | 84 | gops->mm.get_mmu_levels = gk20a_mm_get_mmu_levels; |
86 | gops->mm.init_pdb = gk20a_mm_init_pdb; | 85 | gops->mm.init_pdb = gk20a_mm_init_pdb; |
diff --git a/drivers/gpu/nvgpu/gm20b/mm_gm20b.h b/drivers/gpu/nvgpu/gm20b/mm_gm20b.h index 99d6c161..2bb29ea8 100644 --- a/drivers/gpu/nvgpu/gm20b/mm_gm20b.h +++ b/drivers/gpu/nvgpu/gm20b/mm_gm20b.h | |||
@@ -20,6 +20,9 @@ struct gk20a; | |||
20 | #define PDE_ADDR_START(x, y) ((x) & ~((0x1UL << (y)) - 1)) | 20 | #define PDE_ADDR_START(x, y) ((x) & ~((0x1UL << (y)) - 1)) |
21 | #define PDE_ADDR_END(x, y) ((x) | ((0x1UL << (y)) - 1)) | 21 | #define PDE_ADDR_END(x, y) ((x) | ((0x1UL << (y)) - 1)) |
22 | 22 | ||
23 | u64 gm20b_gpu_phys_addr(struct gk20a *g, | ||
24 | struct nvgpu_gmmu_attrs *attrs, u64 phys); | ||
25 | |||
23 | void gm20b_init_mm(struct gpu_ops *gops); | 26 | void gm20b_init_mm(struct gpu_ops *gops); |
24 | int gm20b_mm_mmu_vpr_info_fetch(struct gk20a *g); | 27 | int gm20b_mm_mmu_vpr_info_fetch(struct gk20a *g); |
25 | #endif | 28 | #endif |