summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu/gk20a/mm_gk20a.h
diff options
context:
space:
mode:
authorAlex Waterman <alexw@nvidia.com>2017-10-10 15:13:25 -0400
committermobile promotions <svcmobile_promotions@nvidia.com>2017-10-11 17:40:22 -0400
commitc53b94f1dd45384c2234e8c3f712df10395d0601 (patch)
tree6b769fd4055c9db8858436b0d391c8ad58fde705 /drivers/gpu/nvgpu/gk20a/mm_gk20a.h
parent50975dcf2afe7b8111d228e1520f652ac7ebe061 (diff)
gpu: nvgpu: Remove phys_addr_t from common code
Remove phys_addr_t from common code and replace it with u64. This faciliates QNX compiling the common code since phys_addr_t is a Linux specific type. JIRA NVGPU-30 JIRA NVGPU-226 Change-Id: I15fe2078f9cd0b07c7e90ad6e359c493afa56714 Signed-off-by: Alex Waterman <alexw@nvidia.com> Reviewed-on: https://git-master.nvidia.com/r/1576432 Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com> Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a/mm_gk20a.h')
-rw-r--r--drivers/gpu/nvgpu/gk20a/mm_gk20a.h15
1 files changed, 0 insertions, 15 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/mm_gk20a.h b/drivers/gpu/nvgpu/gk20a/mm_gk20a.h
index 7029e0e0..3a8fea45 100644
--- a/drivers/gpu/nvgpu/gk20a/mm_gk20a.h
+++ b/drivers/gpu/nvgpu/gk20a/mm_gk20a.h
@@ -344,21 +344,6 @@ bool gk20a_mm_mmu_debug_mode_enabled(struct gk20a *g);
344 344
345int gk20a_mm_mmu_vpr_info_fetch(struct gk20a *g); 345int gk20a_mm_mmu_vpr_info_fetch(struct gk20a *g);
346 346
347static inline phys_addr_t gk20a_mem_phys(struct nvgpu_mem *mem)
348{
349 /* FIXME: the sgt/sgl may get null if this is accessed e.g. in an isr
350 * during channel deletion - attempt to fix at least null derefs */
351 struct sg_table *sgt = mem->priv.sgt;
352
353 if (sgt) {
354 struct scatterlist *sgl = sgt->sgl;
355 if (sgl)
356 return sg_phys(sgl);
357 }
358
359 return 0;
360}
361
362u64 gk20a_locked_gmmu_map(struct vm_gk20a *vm, 347u64 gk20a_locked_gmmu_map(struct vm_gk20a *vm,
363 u64 map_offset, 348 u64 map_offset,
364 struct nvgpu_sgt *sgt, 349 struct nvgpu_sgt *sgt,