| commit | 48b065554aaf36ac2cef97bc6476f110b4316fac | [log] [tgz] |
|---|---|---|
| author | Zabi Khadri <zkhadri@google.com> | Thu Feb 29 09:11:34 2024 +0000 |
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | Fri Mar 15 16:21:18 2024 +0000 |
| tree | 3978a0537d21bfbcfb6a635bcae841b2f1ef4293 | |
| parent | 73b0a0c0a8d7dfedcbe11b40b3a770c00879fa85 [diff] |
monaco: GPU SMMU vote for RPM_SMD_XO_CLK AP could enter suspend before GPU SMMU could unvote RPM_SMD_XO_CLK_SRC. Here RPM would end up being stuck waiting for the clock unvote. Bug: 299941009 QC-Case: 07072330 Test: boot, suspend entry & exit (cherry picked from https://partner-android-review.googlesource.com/q/commit:f3155c5d3ff145040461b1a589b7a28292a0f748) Merged-In: I1f3aed4108a2639dcb431a5364eaa894478b0ddc Change-Id: I1f3aed4108a2639dcb431a5364eaa894478b0ddc
diff --git a/qcom/msm-arm-smmu-monaco.dtsi b/qcom/msm-arm-smmu-monaco.dtsi index ff85346..829a3cb 100755 --- a/qcom/msm-arm-smmu-monaco.dtsi +++ b/qcom/msm-arm-smmu-monaco.dtsi
@@ -18,10 +18,12 @@ vdd-supply = <&gpu_cx_gdsc>; clocks = <&gcc GCC_GPU_MEMNOC_GFX_CLK>, <&gcc GCC_GPU_SNOC_DVM_GFX_CLK>, - <&gpucc GPU_CC_HLOS1_VOTE_GPU_SMMU_CLK>; + <&gpucc GPU_CC_HLOS1_VOTE_GPU_SMMU_CLK>, + <&rpmcc RPM_SMD_XO_CLK_SRC>; clock-names = "gcc_gpu_memnoc_gfx", "gcc_gpu_snoc_dvm_gfx", - "gpu_cc_hlos1_vote_gpu_smmu_clk"; + "gpu_cc_hlos1_vote_gpu_smmu_clk", + "xo"; #size-cells = <1>; #address-cells = <1>; ranges;