5 files changed, 5 insertions, 23 deletions

diff --git a/drivers/gpu/nvgpu/gk20a/fecs_trace_gk20a.c b/drivers/gpu/nvgpu/gk20a/fecs_trace_gk20a.c
index 50336254..7fd1793c 100644
--- a/drivers/gpu/nvgpu/gk20a/fecs_trace_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/fecs_trace_gk20a.c
@@ -622,7 +622,7 @@ int gk20a_fecs_trace_bind_channel(struct gk20a *g,
 
         u32 lo;
         u32 hi;
-        phys_addr_t pa;
+        u64 pa;
         struct channel_ctx_gk20a *ch_ctx = &ch->ch_ctx;
         struct gk20a_fecs_trace *trace = g->fecs_trace;
         struct nvgpu_mem *mem = &ch_ctx->gr_ctx->mem;
diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.h b/drivers/gpu/nvgpu/gk20a/gk20a.h
index 131caa68..72e47ec6 100644
--- a/drivers/gpu/nvgpu/gk20a/gk20a.h
+++ b/drivers/gpu/nvgpu/gk20a/gk20a.h
@@ -1289,7 +1289,7 @@ struct gk20a {
         u64 dma_memory_used;
 
 #if defined(CONFIG_TEGRA_GK20A_NVHOST) && defined(CONFIG_TEGRA_19x_GPU)
-        phys_addr_t     syncpt_unit_base;
+        u64             syncpt_unit_base;
         size_t          syncpt_unit_size;
         u32             syncpt_size;
 #endif
diff --git a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
index 628b6823..707bfb87 100644
--- a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
@@ -2104,7 +2104,7 @@ void gr_gk20a_load_falcon_bind_instblk(struct gk20a *g)
 {
         struct gk20a_ctxsw_ucode_info *ucode_info = &g->ctxsw_ucode_info;
         int retries = FECS_ARB_CMD_TIMEOUT_MAX / FECS_ARB_CMD_TIMEOUT_DEFAULT;
-        phys_addr_t inst_ptr;
+        u64 inst_ptr;
         u32 val;
 
         while ((gk20a_readl(g, gr_fecs_ctxsw_status_1_r()) &
diff --git a/drivers/gpu/nvgpu/gk20a/mm_gk20a.c b/drivers/gpu/nvgpu/gk20a/mm_gk20a.c
index c6ea2587..32c74f3a 100644
--- a/drivers/gpu/nvgpu/gk20a/mm_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/mm_gk20a.c
@@ -1227,13 +1227,10 @@ void gk20a_free_inst_block(struct gk20a *g, struct nvgpu_mem *inst_block)
 
 u64 gk20a_mm_inst_block_addr(struct gk20a *g, struct nvgpu_mem *inst_block)
 {
-        u64 addr;
         if (g->mm.has_physical_mode)
-                addr = gk20a_mem_phys(inst_block);
+                return nvgpu_mem_get_phys_addr(g, inst_block);
         else
-                addr = nvgpu_mem_get_addr(g, inst_block);
-
-        return addr;
+                return nvgpu_mem_get_addr(g, inst_block);
 }
 
 static int gk20a_init_bar1_vm(struct mm_gk20a *mm)
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);
 
 int gk20a_mm_mmu_vpr_info_fetch(struct gk20a *g);
 
-static inline phys_addr_t gk20a_mem_phys(struct nvgpu_mem *mem)
-{
-        /* FIXME: the sgt/sgl may get null if this is accessed e.g. in an isr
-         * during channel deletion - attempt to fix at least null derefs */
-        struct sg_table *sgt = mem->priv.sgt;
-
-        if (sgt) {
-                struct scatterlist *sgl = sgt->sgl;
-                if (sgl)
-                        return sg_phys(sgl);
-        }
-
-        return 0;
-}
-
 u64 gk20a_locked_gmmu_map(struct vm_gk20a *vm,
                           u64 map_offset,
                           struct nvgpu_sgt *sgt,