Skip to content

Commit e091b83

Browse files
pundiramitandersson
authored andcommitted
Revert "arm64: dts: qcom: sm8250: remove bus clock from the mdss node for sm8250 target"
This reverts commit 001ce97. This upstream commit broke AOSP (post Android 12 merge) build on RB5. The device either silently crashes into USB crash mode after android boot animation or we see a blank blue screen with following dpu errors in dmesg: [ T444] hw recovery is not complete for ctl:3 [ T444] [drm:dpu_encoder_phys_vid_prepare_for_kickoff:539] [dpu error]enc31 intf1 ctl 3 reset failure: -22 [ T444] [drm:dpu_encoder_phys_vid_wait_for_commit_done:513] [dpu error]vblank timeout [ T444] [drm:dpu_kms_wait_for_commit_done:454] [dpu error]wait for commit done returned -110 [ C7] [drm:dpu_encoder_frame_done_timeout:2127] [dpu error]enc31 frame done timeout [ T444] [drm:dpu_encoder_phys_vid_wait_for_commit_done:513] [dpu error]vblank timeout [ T444] [drm:dpu_kms_wait_for_commit_done:454] [dpu error]wait for commit done returned -110 Fixes: 001ce97 ("arm64: dts: qcom: sm8250: remove bus clock from the mdss node for sm8250 target") Signed-off-by: Amit Pundir <[email protected]> Signed-off-by: Dmitry Baryshkov <[email protected]> Signed-off-by: Bjorn Andersson <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent 1878f4b commit e091b83

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

arch/arm64/boot/dts/qcom/sm8250.dtsi

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2590,9 +2590,10 @@
25902590
power-domains = <&dispcc MDSS_GDSC>;
25912591

25922592
clocks = <&dispcc DISP_CC_MDSS_AHB_CLK>,
2593+
<&gcc GCC_DISP_HF_AXI_CLK>,
25932594
<&gcc GCC_DISP_SF_AXI_CLK>,
25942595
<&dispcc DISP_CC_MDSS_MDP_CLK>;
2595-
clock-names = "iface", "nrt_bus", "core";
2596+
clock-names = "iface", "bus", "nrt_bus", "core";
25962597

25972598
assigned-clocks = <&dispcc DISP_CC_MDSS_MDP_CLK>;
25982599
assigned-clock-rates = <460000000>;

0 commit comments

Comments
 (0)