2 files changed, 2 insertions, 2 deletions

diff --git a/drivers/gpu/nvgpu/common/mm/gmmu.c b/drivers/gpu/nvgpu/common/mm/gmmu.c
index 53ec3029..78ec361e 100644
--- a/drivers/gpu/nvgpu/common/mm/gmmu.c
+++ b/drivers/gpu/nvgpu/common/mm/gmmu.c
@@ -501,7 +501,7 @@ static int __nvgpu_gmmu_do_update_page_table(struct vm_gk20a *vm,
          * mapping is simple since the "physical" address is actually a virtual
          * IO address and will be contiguous.
          */
-        if (attrs->aperture == APERTURE_SYSMEM && !g->mm.bypass_smmu) {
+        if (attrs->aperture == APERTURE_SYSMEM && nvgpu_iommuable(g)) {
                 u64 io_addr = nvgpu_sgt_get_gpu_addr(g, sgt, sgt->sgl, attrs);
 
                 io_addr += space_to_skip;
diff --git a/drivers/gpu/nvgpu/common/mm/nvgpu_mem.c b/drivers/gpu/nvgpu/common/mm/nvgpu_mem.c
index f472d2a0..73b6b2a7 100644
--- a/drivers/gpu/nvgpu/common/mm/nvgpu_mem.c
+++ b/drivers/gpu/nvgpu/common/mm/nvgpu_mem.c
@@ -96,7 +96,7 @@ u64 nvgpu_sgt_alignment(struct gk20a *g, struct nvgpu_sgt *sgt)
          * and double check length of buffer later. Also, since there's an
          * IOMMU we know that this DMA address is contiguous.
          */
-        if (!g->mm.bypass_smmu &&
+        if (nvgpu_iommuable(g) &&
             nvgpu_sgt_iommuable(g, sgt) &&
             nvgpu_sgt_get_dma(sgt, sgt->sgl))
                 return 1ULL << __ffs(nvgpu_sgt_get_dma(sgt, sgt->sgl));