[2/2] arm64: dts: allwinner: h6: Add IOMMU reference to Hantro G2

Message ID 20221115090644.3602573-3-wenst@chromium.org
State New
Headers
Series arm64: allwinner: h6: Add IOMMU reference to Hantro G2 decoder |

Commit Message

Chen-Yu Tsai Nov. 15, 2022, 9:06 a.m. UTC
  The Hantro G2 video decoder block sits behind the IOMMU. Without a
reference for the system to properly configure the IOMMU, it will fault
and cause the video decoder to fail.

Add a proper reference to the IOMMU port. The master ID is taken from
the IOMMU fault error message on Linux, and the number seems to match
the order in the user manual's IOMMU diagram.

Fixes: 0baddea60e8d ("arm64: dts: allwinner: h6: Add Hantro G2 node")
Signed-off-by: Chen-Yu Tsai <wenst@chromium.org>
---
 arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi | 1 +
 1 file changed, 1 insertion(+)
  

Comments

Jernej Škrabec Nov. 15, 2022, 9:31 p.m. UTC | #1
Dne torek, 15. november 2022 ob 10:06:44 CET je Chen-Yu Tsai napisal(a):
> The Hantro G2 video decoder block sits behind the IOMMU. Without a
> reference for the system to properly configure the IOMMU, it will fault
> and cause the video decoder to fail.
> 
> Add a proper reference to the IOMMU port. The master ID is taken from
> the IOMMU fault error message on Linux, and the number seems to match
> the order in the user manual's IOMMU diagram.
> 
> Fixes: 0baddea60e8d ("arm64: dts: allwinner: h6: Add Hantro G2 node")
> Signed-off-by: Chen-Yu Tsai <wenst@chromium.org>

Acked-by: Jernej Skrabec <jernej.skrabec@gmail.com>

Best regards,
Jernej
  

Patch

diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi
index 53f6660656ac..ca1d287a0a01 100644
--- a/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi
+++ b/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi
@@ -161,6 +161,7 @@  video-codec-g2@1c00000 {
 			clocks = <&ccu CLK_BUS_VP9>, <&ccu CLK_VP9>;
 			clock-names = "bus", "mod";
 			resets = <&ccu RST_BUS_VP9>;
+			iommus = <&iommu 5>;
 		};
 
 		video-codec@1c0e000 {