Skip to content

Commit dc100bc

Browse files
committed
Merge tag 'drm-msm-next-2020-07-30' of https://gitlab.freedesktop.org/drm/msm into drm-next
Take 2 of msm-next pull, this version drops the OPP patch due to [1], so I'll send the gpu opp/bw scaling patch after the OPP patch lands. Since I had to force-push I took the opportunity to rebase on drm-next, and since you already merged in 5.8-rc6 a few fixes from the last cycle dropped out. This time around: * A bunch more a650/a640 (sm8150/sm8250) display and GPU enablement and fixes * Enable dpu dither block for 6bpc panels * dpu suspend fixes * dpu fix for cursor on 2nd display * dsi/mdp5 enablement for sdm630/sdm636/sdm660 I also regenerated the register headers, which accounts for a good bit of the size this time, because we hadn't re-synced the register headers since the early days of a6xx bringup. Signed-off-by: Dave Airlie <[email protected]> From: Rob Clark <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/ <CAF6AEGs_eswoX-E0Ddg5DoEQy35x3GG+6SDXUAjPMrtAWFkqng@mail.gmail.com
2 parents 418eda8 + 1041dee commit dc100bc

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+7205
-1609
lines changed

Documentation/devicetree/bindings/display/msm/dsi.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,7 @@ Required properties:
8787
* "qcom,dsi-phy-20nm"
8888
* "qcom,dsi-phy-28nm-8960"
8989
* "qcom,dsi-phy-14nm"
90+
* "qcom,dsi-phy-14nm-660"
9091
* "qcom,dsi-phy-10nm"
9192
* "qcom,dsi-phy-10nm-8998"
9293
- reg: Physical base address and length of the registers of PLL, PHY. Some

Documentation/devicetree/bindings/display/msm/gpu.txt

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,34 @@ Example a6xx (with GMU):
112112
interconnects = <&rsc_hlos MASTER_GFX3D &rsc_hlos SLAVE_EBI1>;
113113
interconnect-names = "gfx-mem";
114114

115+
gpu_opp_table: opp-table {
116+
compatible = "operating-points-v2";
117+
118+
opp-430000000 {
119+
opp-hz = /bits/ 64 <430000000>;
120+
opp-level = <RPMH_REGULATOR_LEVEL_SVS_L1>;
121+
opp-peak-kBps = <5412000>;
122+
};
123+
124+
opp-355000000 {
125+
opp-hz = /bits/ 64 <355000000>;
126+
opp-level = <RPMH_REGULATOR_LEVEL_SVS>;
127+
opp-peak-kBps = <3072000>;
128+
};
129+
130+
opp-267000000 {
131+
opp-hz = /bits/ 64 <267000000>;
132+
opp-level = <RPMH_REGULATOR_LEVEL_LOW_SVS>;
133+
opp-peak-kBps = <3072000>;
134+
};
135+
136+
opp-180000000 {
137+
opp-hz = /bits/ 64 <180000000>;
138+
opp-level = <RPMH_REGULATOR_LEVEL_MIN_SVS>;
139+
opp-peak-kBps = <1804000>;
140+
};
141+
};
142+
115143
qcom,gmu = <&gmu>;
116144

117145
zap-shader {

0 commit comments

Comments
 (0)