1 files changed, 8 insertions, 3 deletions

diff --git a/drivers/gpu/nvgpu/common/linux/dma.c b/drivers/gpu/nvgpu/common/linux/dma.c
index 786065dd..ec9c3b5a 100644
--- a/drivers/gpu/nvgpu/common/linux/dma.c
+++ b/drivers/gpu/nvgpu/common/linux/dma.c
@@ -637,8 +637,13 @@ bool nvgpu_iommuable(struct gk20a *g)
 #ifdef CONFIG_TEGRA_GK20A
         struct nvgpu_os_linux *l = nvgpu_os_linux_from_gk20a(g);
 
-        return device_is_iommuable(l->dev);
-#else
-        return true;
+        /*
+         * Check against the nvgpu device to see if it's been marked as
+         * IOMMU'able.
+         */
+        if (!device_is_iommuable(l->dev))
+                return false;
 #endif
+
+        return true;
 }