From 01848002248cc5ee95f7bc040a71d01abe309423 Mon Sep 17 00:00:00 2001 From: Sandy Huang Date: Wed, 3 Aug 2022 17:25:15 +0800 Subject: [PATCH] arm64: dts: rockchip: px30: enable vop iommu rockchip,disable-device-link-resume if out of this property, iommu will be enable by pm runtime and use wrong domain, this will lead to vop iommu pagefault. init_loader_memory() --> use drm private domain -> __pm_runtime_resume -> rk_iommu_enable --> use iommu domain -> vop iommu pagefault after this commit: init_loader_memory() --> use drm private domain -> rockchip_drm_dma_attach_device() --> instead of drm private domain -> rockchip_drm_dma_attach_device() --> enable iommu Signed-off-by: Sandy Huang Change-Id: I797747e1f9eecac9feca8b844f66714b657a22f2 --- arch/arm64/boot/dts/rockchip/px30.dtsi | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/arm64/boot/dts/rockchip/px30.dtsi b/arch/arm64/boot/dts/rockchip/px30.dtsi index 72dcd36a2cc7..66790578f960 100644 --- a/arch/arm64/boot/dts/rockchip/px30.dtsi +++ b/arch/arm64/boot/dts/rockchip/px30.dtsi @@ -1686,6 +1686,7 @@ clock-names = "aclk", "iface"; power-domains = <&power PX30_PD_VO>; #iommu-cells = <0>; + rockchip,disable-device-link-resume; status = "disabled"; }; @@ -1734,6 +1735,7 @@ clock-names = "aclk", "iface"; power-domains = <&power PX30_PD_VO>; #iommu-cells = <0>; + rockchip,disable-device-link-resume; status = "disabled"; };