summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorJon Hunter <jonathanh@nvidia.com>2022-01-13 15:31:52 +0100
committerThierry Reding <treding@nvidia.com>2022-01-27 18:35:39 +0100
commitebea268ea583ba4970df425dfef8c8e21d0a4e12 (patch)
tree3718d6f7bed9de0274c90fe295f4dc02d70ca7ba /arch
parentarm64: tegra: Add host1x hotflush reset on Tegra210 (diff)
downloadlinux-ebea268ea583ba4970df425dfef8c8e21d0a4e12.tar.xz
linux-ebea268ea583ba4970df425dfef8c8e21d0a4e12.zip
arm64: tegra: Disable ISO SMMU for Tegra194
Commit e762232f9466 ("arm64: tegra: Add ISO SMMU controller for Tegra194") added the ISO SMMU for display devices on Tegra194. The SMMU is enabled by default but not hooked up to the display controllers yet because we do not have a way to pass frame-buffer memory from the bootloader to the kernel. However, even though the SMMU is not hooked up to the display controllers' SMMU faults are being seen if a display is connected. Therefore, keep the ISO SMMU disabled by default for now. Fixes: e762232f9466 ("arm64: tegra: Add ISO SMMU controller for Tegra194") Signed-off-by: Jon Hunter <jonathanh@nvidia.com> Signed-off-by: Thierry Reding <treding@nvidia.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm64/boot/dts/nvidia/tegra194.dtsi2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/boot/dts/nvidia/tegra194.dtsi b/arch/arm64/boot/dts/nvidia/tegra194.dtsi
index 3c4acfca459d..6005e422c968 100644
--- a/arch/arm64/boot/dts/nvidia/tegra194.dtsi
+++ b/arch/arm64/boot/dts/nvidia/tegra194.dtsi
@@ -1585,7 +1585,7 @@
#iommu-cells = <1>;
nvidia,memory-controller = <&mc>;
- status = "okay";
+ status = "disabled";
};
smmu: iommu@12000000 {