| Message ID | 20230119133901.1892413-1-cyndis@kapsi.fi |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [1/4] arm64: tegra: Mark host1x as dma-coherent on Tegra194/234 | expand |
From: Thierry Reding <treding@nvidia.com> On Thu, 19 Jan 2023 15:38:58 +0200, Mikko Perttunen wrote: > From: Mikko Perttunen <mperttunen@nvidia.com> > > Ensure appropriate configuration is done to make the host1x device > and context devices DMA coherent by adding the dma-coherent flag. > > Applied, thanks! [1/4] arm64: tegra: Mark host1x as dma-coherent on Tegra194/234 (no commit info) [2/4] gpu: host1x: Fix mask for syncpoint increment register commit: c42babb37bc2ba84d692d8d13ce900636b19d2b7 [3/4] gpu: host1x: Don't skip assigning syncpoints to channels commit: 529babe886a29b3e4ffcdc61b755c3d7245c6cf2 [4/4] drm/tegra: firewall: Check for is_addr_reg existence in IMM check commit: 40aef7daa1bdf73bd66aa97e6e2069e340415a38 Best regards,
diff --git a/arch/arm64/boot/dts/nvidia/tegra194.dtsi b/arch/arm64/boot/dts/nvidia/tegra194.dtsi index 4afcbd60e144..d8169920b33b 100644 --- a/arch/arm64/boot/dts/nvidia/tegra194.dtsi +++ b/arch/arm64/boot/dts/nvidia/tegra194.dtsi @@ -1918,6 +1918,7 @@ host1x@13e00000 { interconnects = <&mc TEGRA194_MEMORY_CLIENT_HOST1XDMAR &emc>; interconnect-names = "dma-mem"; iommus = <&smmu TEGRA194_SID_HOST1X>; + dma-coherent; /* Context isolation domains */ iommu-map = <0 &smmu TEGRA194_SID_HOST1X_CTX0 1>, diff --git a/arch/arm64/boot/dts/nvidia/tegra234.dtsi b/arch/arm64/boot/dts/nvidia/tegra234.dtsi index eaf05ee9acd1..77ceed615b7f 100644 --- a/arch/arm64/boot/dts/nvidia/tegra234.dtsi +++ b/arch/arm64/boot/dts/nvidia/tegra234.dtsi @@ -571,6 +571,7 @@ host1x@13e00000 { interconnects = <&mc TEGRA234_MEMORY_CLIENT_HOST1XDMAR &emc>; interconnect-names = "dma-mem"; iommus = <&smmu_niso1 TEGRA234_SID_HOST1X>; + dma-coherent; /* Context isolation domains */ iommu-map = <0 &smmu_niso0 TEGRA234_SID_HOST1X_CTX0 1>,