Skip to content

Commit 535cd71

Browse files
committed
Merge tag 'drm-msm-next-2023-01-30' of https://gitlab.freedesktop.org/drm/msm into drm-next
msm-next for v6.3 There is one devfreq patch, maintainer acked to land via msm-next to avoid a build break on platforms that do not support PM_DEVFREQ. And otherwise the usual assortment: GPU: - Add MSM_SUBMIT_BO_NO_IMPLICIT - a2xx: Support to load legacy firmware - a6xx: GPU devcore dump updates for a650/a660 - GPU devfreq tuning and fixes DPU, DSI, MDSS: - Support for SM8350, SM8450 SM8550 and SC8280XP platform Core: - Added bindings for SM8150 (driver support already present) DPU: - Partial support for DSC on SM8150 and SM8250 - Fixed color transformation matrix being lost on suspend/resume - Include DSC blocks into register snapshot - Misc HW catalog fixes DP: - Support for DP on SDM845 and SC8280XP platforms - HPD fixes - Support for limiting DP link rate via DT property, this enables - Support for HBR3 rates. DSI: - Validate display modes according to the DSI OPP table - DSI PHY support for the SM6375 platform - Fixed byte intf clock selection for 14nm PHYs - Fix the case of empty OPP tables (fixing db410c) - DT schema rework and fixes HDMI: - Turn 8960 HDMI PHY into clock provider, - Make 8960 HDMI PHY use PXO clock from DT MDP5: - Schema conversion to YAML Signed-off-by: Dave Airlie <[email protected]> From: Rob Clark <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/CAF6AEGv6zQ-zsgS+NG+WuV=tk51q9vA2QdKqYhNgiXQddAdZjA@mail.gmail.com
2 parents e9b71eb + dbd7a2a commit 535cd71

File tree

95 files changed

+4070
-759
lines changed

Some content is hidden

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

95 files changed

+4070
-759
lines changed

Documentation/devicetree/bindings/display/msm/dp-controller.yaml

Lines changed: 28 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,9 @@ properties:
2121
- qcom,sc7280-edp
2222
- qcom,sc8180x-dp
2323
- qcom,sc8180x-edp
24+
- qcom,sc8280xp-dp
25+
- qcom,sc8280xp-edp
26+
- qcom,sdm845-dp
2427
- qcom,sm8350-dp
2528

2629
reg:
@@ -81,6 +84,7 @@ properties:
8184

8285
data-lanes:
8386
$ref: /schemas/types.yaml#/definitions/uint32-array
87+
deprecated: true
8488
minItems: 1
8589
maxItems: 4
8690
items:
@@ -102,8 +106,28 @@ properties:
102106
description: Input endpoint of the controller
103107

104108
port@1:
105-
$ref: /schemas/graph.yaml#/properties/port
109+
$ref: /schemas/graph.yaml#/$defs/port-base
106110
description: Output endpoint of the controller
111+
properties:
112+
endpoint:
113+
$ref: /schemas/media/video-interfaces.yaml#
114+
unevaluatedProperties: false
115+
properties:
116+
data-lanes:
117+
minItems: 1
118+
maxItems: 4
119+
items:
120+
enum: [ 0, 1, 2, 3 ]
121+
122+
link-frequencies:
123+
minItems: 1
124+
maxItems: 4
125+
items:
126+
enum: [ 1620000000, 2700000000, 5400000000, 8100000000 ]
127+
128+
required:
129+
- port@0
130+
- port@1
107131

108132
required:
109133
- compatible
@@ -127,11 +151,10 @@ allOf:
127151
enum:
128152
- qcom,sc7280-edp
129153
- qcom,sc8180x-edp
154+
- qcom,sc8280xp-edp
130155
then:
131156
properties:
132157
"#sound-dai-cells": false
133-
reg:
134-
maxItems: 4
135158
else:
136159
properties:
137160
aux-bus: false
@@ -193,6 +216,8 @@ examples:
193216
reg = <1>;
194217
endpoint {
195218
remote-endpoint = <&typec>;
219+
data-lanes = <0 1>;
220+
link-frequencies = /bits/ 64 <1620000000 2700000000 5400000000 8100000000>;
196221
};
197222
};
198223
};

Documentation/devicetree/bindings/display/msm/dpu-common.yaml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,15 @@ maintainers:
1313
description: |
1414
Common properties for QCom DPU display controller.
1515
16+
# Do not select this by default, otherwise it is also selected for all
17+
# display-controller@ nodes
18+
select:
19+
false
20+
1621
properties:
22+
$nodename:
23+
pattern: '^display-controller@[0-9a-f]+$'
24+
1725
interrupts:
1826
maxItems: 1
1927

@@ -40,10 +48,6 @@ properties:
4048
- port@0
4149

4250
required:
43-
- compatible
44-
- reg
45-
- reg-names
46-
- clocks
4751
- interrupts
4852
- power-domains
4953
- operating-points-v2

0 commit comments

Comments
 (0)