summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu/common/linux/driver_common.c
diff options
context:
space:
mode:
authorAlex Waterman <alexw@nvidia.com>2018-01-29 19:21:30 -0500
committermobile promotions <svcmobile_promotions@nvidia.com>2018-02-02 15:11:53 -0500
commit98da3f8eed914225e9ffe0f768d7647506e95cdc (patch)
treea16c4e29f6983d648f08d2ba1d34440883231cef /drivers/gpu/nvgpu/common/linux/driver_common.c
parentac5b3d9640790b99798070fbb011c4b0c100d33e (diff)
gpu: nvgpu: Cleanup usage of bypass_smmu
The GPU has multiple different operating modes in respect to IOMMU'ability. As such there needs to be a clean way to tell the driver whether it is IOMMU'able or not. This state also does not always reflect what is possible: all becasue the GPU can generate IOMMU'ed memory requests doesn't mean it wants to. The nvgpu_iommuable() API has now existed for a little while which is a useful way to convey whether nvgpu should consider the GPU as IOMMU'able. However, there is also the g->mm.bypass_smmu flag which used to be able to override what the GPU decided it should do. Typically it was assigned the same value as nvgpu_iommuable() but that was not necessarily a requirment. This patch removes all the usages of g->mm.bypass_smmu and instead uses the nvgpu_iommuable() function. All places where the check against g->mm.bypass_smmu have been replaced with nvgpu_iommuable(). The code should now be much cleaner. Subsequently other checks can also be placed in the nvgpu_iommuable() function. For example, when NVLINK comes online and the GPU should no longer consider DMA addresses and instead use scatter-gather lists directly the ngpu_iommuable() function will be able to check the state of NVLINK and then act accordingly. Change-Id: I0da6262386de15709decac89d63d3eecfec20cd7 Signed-off-by: Alex Waterman <alexw@nvidia.com> Reviewed-on: https://git-master.nvidia.com/r/1648332 Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com> Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/common/linux/driver_common.c')
-rw-r--r--drivers/gpu/nvgpu/common/linux/driver_common.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/gpu/nvgpu/common/linux/driver_common.c b/drivers/gpu/nvgpu/common/linux/driver_common.c
index ed7f7fe9..9df7ea3f 100644
--- a/drivers/gpu/nvgpu/common/linux/driver_common.c
+++ b/drivers/gpu/nvgpu/common/linux/driver_common.c
@@ -184,7 +184,6 @@ static void nvgpu_init_mm_vars(struct gk20a *g)
184{ 184{
185 struct gk20a_platform *platform = dev_get_drvdata(dev_from_gk20a(g)); 185 struct gk20a_platform *platform = dev_get_drvdata(dev_from_gk20a(g));
186 186
187 g->mm.bypass_smmu = platform->bypass_smmu;
188 g->mm.disable_bigpage = platform->disable_bigpage; 187 g->mm.disable_bigpage = platform->disable_bigpage;
189 __nvgpu_set_enabled(g, NVGPU_MM_HONORS_APERTURE, 188 __nvgpu_set_enabled(g, NVGPU_MM_HONORS_APERTURE,
190 platform->honors_aperture); 189 platform->honors_aperture);