diff --git a/drivers/gpu/nvgpu/common/mm/gmmu.c b/drivers/gpu/nvgpu/common/mm/gmmu.c
index 4e723e2ec..f6f2b9add 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)
 {
 	u64 page_addr;
 
-	if (g->mm.has_physical_mode)
+	if (nvgpu_is_enabled(g, NVGPU_SUPPORT_NVLINK)) {
 		page_addr = nvgpu_mem_get_phys_addr(g, pd->mem);
-	else
+	} else {
 		page_addr = nvgpu_mem_get_addr(g, pd->mem);
+	}
 
 	return page_addr + pd->mem_offs;
 }
diff --git a/drivers/gpu/nvgpu/common/mm/mm.c b/drivers/gpu/nvgpu/common/mm/mm.c
index 42d708eee..2c3a1cd6a 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)
 
 u64 nvgpu_inst_block_addr(struct gk20a *g, struct nvgpu_mem *inst_block)
 {
-	if (g->mm.has_physical_mode)
+	if (nvgpu_is_enabled(g, NVGPU_SUPPORT_NVLINK)) {
 		return nvgpu_mem_get_phys_addr(g, inst_block);
-	else
+	} else {
 		return nvgpu_mem_get_addr(g, inst_block);
+	}
 }
 
 void nvgpu_free_inst_block(struct gk20a *g, struct nvgpu_mem *inst_block)
diff --git a/drivers/gpu/nvgpu/include/nvgpu/mm.h b/drivers/gpu/nvgpu/include/nvgpu/mm.h
index 033e25480..3a1b2a6c6 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/mm.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/mm.h
@@ -147,7 +147,6 @@ struct mm_gk20a {
 	bool ltc_enabled_current;
 	bool ltc_enabled_target;
 	bool disable_bigpage;
-	bool has_physical_mode;
 
 	struct nvgpu_mem sysmem_flush;
 
diff --git a/drivers/gpu/nvgpu/os/linux/module.c b/drivers/gpu/nvgpu/os/linux/module.c
index 46a82d86e..4b64847e6 100644
--- a/drivers/gpu/nvgpu/os/linux/module.c
+++ b/drivers/gpu/nvgpu/os/linux/module.c
@@ -1257,8 +1257,6 @@ static int gk20a_probe(struct platform_device *dev)
 		goto return_err;
 	}
 
-	gk20a->mm.has_physical_mode = !nvgpu_is_hypervisor_mode(gk20a);
-
 	return 0;
 
 return_err:
diff --git a/drivers/gpu/nvgpu/os/linux/pci.c b/drivers/gpu/nvgpu/os/linux/pci.c
index e9374769e..79a304959 100644
--- a/drivers/gpu/nvgpu/os/linux/pci.c
+++ b/drivers/gpu/nvgpu/os/linux/pci.c
@@ -806,8 +806,6 @@ static int nvgpu_pci_probe(struct pci_dev *pdev,
 		}
 	}
 
-	g->mm.has_physical_mode = false;
-
 	return 0;
 
 err_free_irq: