nv-tegra-mirror/linux-nvgpu
1
0
Fork 0
mirror of git://nv-tegra.nvidia.com/linux-nvgpu.git synced 2025-12-24 02:22:34 +03:00
Code Issues Packages Projects Releases Wiki Activity

gpu: nvgpu: Add SMMU bit only if SMMU enabled

Browse Source 
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>
This commit is contained in:
Terje Bergstrom
2015-01-16 13:46:55 -08:00
committed by Dan Willemsen
parent 0079e5b015
commit f11443daff
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/gpu/nvgpu/gk20a/mm_gk20a.c
View File

@@ -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)