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

gpu: nvgpu: Remove device_is_iommuable

Browse Source 
The downstream device_is_iommuable() is removed.
Check the dev->archdata.iommu pointer instead.

Bug 200385990

Change-Id: I1fe400beddc8b4f2262368b5e0e8726abca007a6
Signed-off-by: Nicolin Chen <nicolinc@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/2030334
Reviewed-by: svc-mobile-coverity <svc-mobile-coverity@nvidia.com>
Reviewed-by: Automatic_Commit_Validation_User
GVS: Gerrit_Virtual_Submit
Reviewed-by: Ashish Mhetre <amhetre@nvidia.com>
Reviewed-by: Krishna Reddy <vdumpa@nvidia.com>
Reviewed-by: Alex Waterman <alexw@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
This commit is contained in:
Nicolin Chen
2019-02-28 16:04:07 -08:00
committed by mobile promotions
parent ad351f17be
commit 31ac769454
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/gpu/nvgpu/os/linux/linux-dma.c
View File

@@ -496,12 +496,13 @@ bool nvgpu_iommuable(struct gk20a *g)
{ {
#ifdef CONFIG_TEGRA_GK20A #ifdef CONFIG_TEGRA_GK20A
struct nvgpu_os_linux *l = nvgpu_os_linux_from_gk20a(g); struct nvgpu_os_linux *l = nvgpu_os_linux_from_gk20a(g);
struct device *dev = l->dev;
/* /*
* Check against the nvgpu device to see if it's been marked as * Check against the nvgpu device to see if it's been marked as
* IOMMU'able. * IOMMU'able.
*/ */
if (!device_is_iommuable(l->dev)) if (dev->archdata.iommu == NULL)
return false; return false;
#endif #endif

4
drivers/gpu/nvgpu/os/linux/platform_gp10b_tegra.c
View File

@@ -1,7 +1,7 @@
/* /*
* GP10B Tegra Platform Interface * GP10B Tegra Platform Interface
* *
* Copyright (c) 2014-2018, NVIDIA CORPORATION. All rights reserved. * Copyright (c) 2014-2019, NVIDIA CORPORATION. All rights reserved.
* *
* This program is free software; you can redistribute it and/or modify it * This program is free software; you can redistribute it and/or modify it
* under the terms and conditions of the GNU General Public License, * under the terms and conditions of the GNU General Public License,
@@ -155,7 +155,7 @@ static int gp10b_tegra_probe(struct device *dev)
if (ret) if (ret)
return ret; return ret;
platform->disable_bigpage = !device_is_iommuable(dev); platform->disable_bigpage = !dev->archdata.iommu;
platform->g->gr.ctx_vars.dump_ctxsw_stats_on_channel_close platform->g->gr.ctx_vars.dump_ctxsw_stats_on_channel_close
= false; = false;

4
drivers/gpu/nvgpu/os/linux/platform_gv11b_tegra.c
View File

@@ -1,7 +1,7 @@
/* /*
* GV11B Tegra Platform Interface * GV11B Tegra Platform Interface
* *
* Copyright (c) 2016-2018, NVIDIA CORPORATION. All rights reserved. * Copyright (c) 2016-2019, NVIDIA CORPORATION. All rights reserved.
* *
* This program is free software; you can redistribute it and/or modify it * This program is free software; you can redistribute it and/or modify it
* under the terms and conditions of the GNU General Public License, * under the terms and conditions of the GNU General Public License,
@@ -84,7 +84,7 @@ static int gv11b_tegra_probe(struct device *dev)
if (err) if (err)
return err; return err;
platform->disable_bigpage = !device_is_iommuable(dev); platform->disable_bigpage = !dev->archdata.iommu;
platform->g->gr.ctx_vars.dump_ctxsw_stats_on_channel_close platform->g->gr.ctx_vars.dump_ctxsw_stats_on_channel_close
= false; = false;