diff options
author | Terje Bergstrom <tbergstrom@nvidia.com> | 2015-01-16 16:46:55 -0500 |
---|---|---|
committer | Dan Willemsen <dwillemsen@nvidia.com> | 2015-04-04 21:03:22 -0400 |
commit | f11443daff6e61351039d2bd24b4918b45288a63 (patch) | |
tree | 0b24a7a3e9e22786e1f1a93424ac90314fa54658 /drivers/gpu/nvgpu/gk20a | |
parent | 0079e5b015c71c889ca6339d7c9f384e1de7d409 (diff) |
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>
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/mm_gk20a.c | 5 |
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) | |||
1709 | 1709 | ||
1710 | u64 gk20a_mm_smmu_vaddr_translate(struct gk20a *g, dma_addr_t iova) | 1710 | u64 gk20a_mm_smmu_vaddr_translate(struct gk20a *g, dma_addr_t iova) |
1711 | { | 1711 | { |
1712 | return iova | 1ULL << g->ops.mm.get_physical_addr_bits(g); | 1712 | if (!device_is_iommuable(dev_from_gk20a(g))) |
1713 | return iova; | ||
1714 | else | ||
1715 | return iova | 1ULL << g->ops.mm.get_physical_addr_bits(g); | ||
1713 | } | 1716 | } |
1714 | 1717 | ||
1715 | u64 gk20a_mm_iova_addr(struct gk20a *g, struct scatterlist *sgl) | 1718 | u64 gk20a_mm_iova_addr(struct gk20a *g, struct scatterlist *sgl) |