diff --git a/drivers/gpu/nvgpu/os/linux/linux-dma.c b/drivers/gpu/nvgpu/os/linux/linux-dma.c
index 6b70a36b2..22a90e1ee 100644
--- a/drivers/gpu/nvgpu/os/linux/linux-dma.c
+++ b/drivers/gpu/nvgpu/os/linux/linux-dma.c
@@ -496,12 +496,13 @@ bool nvgpu_iommuable(struct gk20a *g)
 {
 #ifdef CONFIG_TEGRA_GK20A
 	struct nvgpu_os_linux *l = nvgpu_os_linux_from_gk20a(g);
+	struct device *dev = l->dev;
 
 	/*
 	 * Check against the nvgpu device to see if it's been marked as
 	 * IOMMU'able.
 	 */
-	if (!device_is_iommuable(l->dev))
+	if (dev->archdata.iommu == NULL)
 		return false;
 #endif
 
diff --git a/drivers/gpu/nvgpu/os/linux/platform_gp10b_tegra.c b/drivers/gpu/nvgpu/os/linux/platform_gp10b_tegra.c
index 395370902..846d2c282 100644
--- a/drivers/gpu/nvgpu/os/linux/platform_gp10b_tegra.c
+++ b/drivers/gpu/nvgpu/os/linux/platform_gp10b_tegra.c
@@ -1,7 +1,7 @@
 /*
  * GP10B Tegra Platform Interface
  *
- * Copyright (c) 2014-2018, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2014-2019, NVIDIA CORPORATION.  All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms and conditions of the GNU General Public License,
@@ -155,7 +155,7 @@ static int gp10b_tegra_probe(struct device *dev)
 	if (ret)
 		return ret;
 
-	platform->disable_bigpage = !device_is_iommuable(dev);
+	platform->disable_bigpage = !dev->archdata.iommu;
 
 	platform->g->gr.ctx_vars.dump_ctxsw_stats_on_channel_close
 		= false;
diff --git a/drivers/gpu/nvgpu/os/linux/platform_gv11b_tegra.c b/drivers/gpu/nvgpu/os/linux/platform_gv11b_tegra.c
index 6dde735a2..c4fc7b57d 100644
--- a/drivers/gpu/nvgpu/os/linux/platform_gv11b_tegra.c
+++ b/drivers/gpu/nvgpu/os/linux/platform_gv11b_tegra.c
@@ -1,7 +1,7 @@
 /*
  * GV11B Tegra Platform Interface
  *
- * Copyright (c) 2016-2018, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2016-2019, NVIDIA CORPORATION.  All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms and conditions of the GNU General Public License,
@@ -84,7 +84,7 @@ static int gv11b_tegra_probe(struct device *dev)
 	if (err)
 		return err;
 
-	platform->disable_bigpage = !device_is_iommuable(dev);
+	platform->disable_bigpage = !dev->archdata.iommu;
 
 	platform->g->gr.ctx_vars.dump_ctxsw_stats_on_channel_close
 		= false;