gpu: nvgpu: Add SMMU bit only if SMMU enabled

If SMMU is disabled, we should not add the SMMU bit to addresses.

Change-Id: I6dd82e18b63474fb487d21f421ef06467551595b
Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-on: http://git-master/r/673250
Reviewed-by: Adeel Raza <araza@nvidia.com>
Tested-by: Adeel Raza <araza@nvidia.com>

1 files changed, 4 insertions, 1 deletions

diff --git a/drivers/gpu/nvgpu/gk20a/mm_gk20a.c b/drivers/gpu/nvgpu/gk20a/mm_gk20a.c
index 09948a25..b01efd41 100644
--- a/drivers/gpu/nvgpu/gk20a/mm_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/mm_gk20a.c
@@ -1709,7 +1709,10 @@ void gk20a_free_sgtable(struct sg_table **sgt)
 
 u64 gk20a_mm_smmu_vaddr_translate(struct gk20a *g, dma_addr_t iova)
 {
-        return iova | 1ULL << g->ops.mm.get_physical_addr_bits(g);
+        if (!device_is_iommuable(dev_from_gk20a(g)))
+                return iova;
+        else
+                return iova | 1ULL << g->ops.mm.get_physical_addr_bits(g);
 }
 
 u64 gk20a_mm_iova_addr(struct gk20a *g, struct scatterlist *sgl)