diff options
Diffstat (limited to 'drivers/gpu/nvgpu/common/mm')
-rw-r--r-- | drivers/gpu/nvgpu/common/mm/gmmu.c | 5 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/common/mm/mm.c | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/drivers/gpu/nvgpu/common/mm/gmmu.c b/drivers/gpu/nvgpu/common/mm/gmmu.c index 4e723e2e..f6f2b9ad 100644 --- a/drivers/gpu/nvgpu/common/mm/gmmu.c +++ b/drivers/gpu/nvgpu/common/mm/gmmu.c | |||
@@ -215,10 +215,11 @@ static u64 nvgpu_pde_phys_addr(struct gk20a *g, struct nvgpu_gmmu_pd *pd) | |||
215 | { | 215 | { |
216 | u64 page_addr; | 216 | u64 page_addr; |
217 | 217 | ||
218 | if (g->mm.has_physical_mode) | 218 | if (nvgpu_is_enabled(g, NVGPU_SUPPORT_NVLINK)) { |
219 | page_addr = nvgpu_mem_get_phys_addr(g, pd->mem); | 219 | page_addr = nvgpu_mem_get_phys_addr(g, pd->mem); |
220 | else | 220 | } else { |
221 | page_addr = nvgpu_mem_get_addr(g, pd->mem); | 221 | page_addr = nvgpu_mem_get_addr(g, pd->mem); |
222 | } | ||
222 | 223 | ||
223 | return page_addr + pd->mem_offs; | 224 | return page_addr + pd->mem_offs; |
224 | } | 225 | } |
diff --git a/drivers/gpu/nvgpu/common/mm/mm.c b/drivers/gpu/nvgpu/common/mm/mm.c index 42d708ee..2c3a1cd6 100644 --- a/drivers/gpu/nvgpu/common/mm/mm.c +++ b/drivers/gpu/nvgpu/common/mm/mm.c | |||
@@ -128,10 +128,11 @@ int nvgpu_mm_suspend(struct gk20a *g) | |||
128 | 128 | ||
129 | u64 nvgpu_inst_block_addr(struct gk20a *g, struct nvgpu_mem *inst_block) | 129 | u64 nvgpu_inst_block_addr(struct gk20a *g, struct nvgpu_mem *inst_block) |
130 | { | 130 | { |
131 | if (g->mm.has_physical_mode) | 131 | if (nvgpu_is_enabled(g, NVGPU_SUPPORT_NVLINK)) { |
132 | return nvgpu_mem_get_phys_addr(g, inst_block); | 132 | return nvgpu_mem_get_phys_addr(g, inst_block); |
133 | else | 133 | } else { |
134 | return nvgpu_mem_get_addr(g, inst_block); | 134 | return nvgpu_mem_get_addr(g, inst_block); |
135 | } | ||
135 | } | 136 | } |
136 | 137 | ||
137 | void nvgpu_free_inst_block(struct gk20a *g, struct nvgpu_mem *inst_block) | 138 | void nvgpu_free_inst_block(struct gk20a *g, struct nvgpu_mem *inst_block) |