nv-tegra-mirror/linux-nv-oot
1
0
Fork 0
mirror of git://nv-tegra.nvidia.com/linux-nv-oot.git synced 2025-12-24 10:11:26 +03:00
Code Issues Packages Projects Releases Wiki Activity

video: tegra: nvmap: Remove use of iommu_present API

Browse Source 
Upstream has removed iommu_present function from k6.13, hence remove
call to this function from nvmap, as IOMMU will be always present in
any latest SOC. We will rely on dont-convert-iovmm-to-carveout property
from DT to avoid converting the entire IOVMM to carveout.

Bug 4923950

Change-Id: Ia7e374e81ab8c78f3d17187aebd2fcf0170fabdc
Signed-off-by: Ketan Patil <ketanp@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/c/linux-nv-oot/+/3243903
Reviewed-by: Sachin Nikam <snikam@nvidia.com>
GVS: buildbot_gerritrpt <buildbot_gerritrpt@nvidia.com>
Reviewed-by: Jon Hunter <jonathanh@nvidia.com>
Reviewed-by: Pritesh Raithatha <praithatha@nvidia.com>
This commit is contained in:
Ketan Patil
2024-11-06 13:13:19 +00:00
committed by Jon Hunter
parent 9410c97b90
commit 54aee56239
1 changed files with 2 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
drivers/video/tegra/nvmap/nvmap_dev.c
View File

@@ -554,25 +554,6 @@ exit:
return memory_available;
}
static bool nvmap_is_iommu_present(void)
{
struct device_node *np;
struct property *prop;
np = of_find_node_by_name(NULL, "iommu");
while (np) {
prop = of_find_property(np, "status", NULL);
if (prop && !strcmp(prop->value, "okay")) {
of_node_put(np);
return true;
}
of_node_put(np);
np = of_find_node_by_name(np, "iommu");
}
return false;
}
int __init nvmap_probe(struct platform_device *pdev)
{
struct nvmap_platform_data *plat;
@@ -654,11 +635,8 @@ int __init nvmap_probe(struct platform_device *pdev)
generic_carveout_present = 1;
if (generic_carveout_present) {
if (!iommu_present(&platform_bus_type) &&
!nvmap_is_iommu_present())
nvmap_convert_iovmm_to_carveout = 1;
else if (!of_property_read_bool(pdev->dev.of_node,
"dont-convert-iovmm-to-carveout"))
if (!of_property_read_bool(pdev->dev.of_node,
"dont-convert-iovmm-to-carveout"))
nvmap_convert_iovmm_to_carveout = 1;
} else {
nvmap_convert_carveout_to_iovmm = 1;