Skip to content

Commit 3f5ba63

Browse files
committed
Merge tag 'drm-msm-next-2023-10-17' of https://gitlab.freedesktop.org/drm/msm into drm-next
Updates for v6.7 DP: - use existing helpers for DPCD handling instead of open-coded functions - set the subconnector type according to the plugged cable / dongle skip validity check for DP CTS EDID checksum DPU: - continued migration of feature flags to use core revision checks - reworked interrupts code to use '0' as NO_IRQ, removed raw IRQ indices from log / trace output gpu: - a7xx support (a730, a740) - fixes and additional speedbins for a635, a643 core: - decouple msm_drv from kms to more cleanly support headless devices (like imx5+a2xx) From: Rob Clark <robdclark@gmail.com> Link: https://patchwork.freedesktop.org/patch/msgid/CAF6AEGvzkBL2_OgyOeP_b6rVEjrNdfm8jcKzaB04HqHyT5jYwA@mail.gmail.com Signed-off-by: Dave Airlie <airlied@redhat.com>
2 parents 7cd62ea + b08d26d commit 3f5ba63

File tree

99 files changed

+2365
-1403
lines changed

Some content is hidden

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

99 files changed

+2365
-1403
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,7 @@ properties:
114114

115115
port@1:
116116
$ref: /schemas/graph.yaml#/$defs/port-base
117+
unevaluatedProperties: false
117118
description: Output endpoint of the controller
118119
properties:
119120
endpoint:

Documentation/devicetree/bindings/display/msm/gmu.yaml

Lines changed: 46 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ properties:
2121
compatible:
2222
oneOf:
2323
- items:
24-
- pattern: '^qcom,adreno-gmu-6[0-9][0-9]\.[0-9]$'
24+
- pattern: '^qcom,adreno-gmu-[67][0-9][0-9]\.[0-9]$'
2525
- const: qcom,adreno-gmu
2626
- const: qcom,adreno-gmu-wrapper
2727

@@ -64,6 +64,10 @@ properties:
6464
iommus:
6565
maxItems: 1
6666

67+
qcom,qmp:
68+
$ref: /schemas/types.yaml#/definitions/phandle
69+
description: Reference to the AOSS side-channel message RAM
70+
6771
operating-points-v2: true
6872

6973
opp-table:
@@ -213,6 +217,47 @@ allOf:
213217
- const: axi
214218
- const: memnoc
215219

220+
- if:
221+
properties:
222+
compatible:
223+
contains:
224+
enum:
225+
- qcom,adreno-gmu-730.1
226+
- qcom,adreno-gmu-740.1
227+
then:
228+
properties:
229+
reg:
230+
items:
231+
- description: Core GMU registers
232+
- description: Resource controller registers
233+
- description: GMU PDC registers
234+
reg-names:
235+
items:
236+
- const: gmu
237+
- const: rscc
238+
- const: gmu_pdc
239+
clocks:
240+
items:
241+
- description: GPU AHB clock
242+
- description: GMU clock
243+
- description: GPU CX clock
244+
- description: GPU AXI clock
245+
- description: GPU MEMNOC clock
246+
- description: GMU HUB clock
247+
- description: GPUSS DEMET clock
248+
clock-names:
249+
items:
250+
- const: ahb
251+
- const: gmu
252+
- const: cxo
253+
- const: axi
254+
- const: memnoc
255+
- const: hub
256+
- const: demet
257+
258+
required:
259+
- qcom,qmp
260+
216261
- if:
217262
properties:
218263
compatible:

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ properties:
2323
The driver is parsing the compat string for Adreno to
2424
figure out the gpu-id and patch level.
2525
items:
26-
- pattern: '^qcom,adreno-[3-6][0-9][0-9]\.[0-9]$'
26+
- pattern: '^qcom,adreno-[3-7][0-9][0-9]\.[0-9]$'
2727
- const: qcom,adreno
2828
- description: |
2929
The driver is parsing the compat string for Imageon to
@@ -203,7 +203,7 @@ allOf:
203203
properties:
204204
compatible:
205205
contains:
206-
pattern: '^qcom,adreno-6[0-9][0-9]\.[0-9]$'
206+
pattern: '^qcom,adreno-[67][0-9][0-9]\.[0-9]$'
207207

208208
then: # Starting with A6xx, the clocks are usually defined in the GMU node
209209
properties:

Documentation/devicetree/bindings/display/msm/qcom,msm8998-mdss.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,16 @@ properties:
3838
patternProperties:
3939
"^display-controller@[0-9a-f]+$":
4040
type: object
41+
additionalProperties: true
42+
4143
properties:
4244
compatible:
4345
const: qcom,msm8998-dpu
4446

4547
"^dsi@[0-9a-f]+$":
4648
type: object
49+
additionalProperties: true
50+
4751
properties:
4852
compatible:
4953
items:
@@ -52,6 +56,8 @@ patternProperties:
5256

5357
"^phy@[0-9a-f]+$":
5458
type: object
59+
additionalProperties: true
60+
5561
properties:
5662
compatible:
5763
const: qcom,dsi-phy-10nm-8998

Documentation/devicetree/bindings/display/msm/qcom,qcm2290-mdss.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,18 +44,24 @@ properties:
4444
patternProperties:
4545
"^display-controller@[0-9a-f]+$":
4646
type: object
47+
additionalProperties: true
48+
4749
properties:
4850
compatible:
4951
const: qcom,qcm2290-dpu
5052

5153
"^dsi@[0-9a-f]+$":
5254
type: object
55+
additionalProperties: true
56+
5357
properties:
5458
compatible:
5559
const: qcom,dsi-ctrl-6g-qcm2290
5660

5761
"^phy@[0-9a-f]+$":
5862
type: object
63+
additionalProperties: true
64+
5965
properties:
6066
compatible:
6167
const: qcom,dsi-phy-14nm-2290

Documentation/devicetree/bindings/display/msm/qcom,sc7180-mdss.yaml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,18 +44,24 @@ properties:
4444
patternProperties:
4545
"^display-controller@[0-9a-f]+$":
4646
type: object
47+
additionalProperties: true
48+
4749
properties:
4850
compatible:
4951
const: qcom,sc7180-dpu
5052

5153
"^displayport-controller@[0-9a-f]+$":
5254
type: object
55+
additionalProperties: true
56+
5357
properties:
5458
compatible:
5559
const: qcom,sc7180-dp
5660

5761
"^dsi@[0-9a-f]+$":
5862
type: object
63+
additionalProperties: true
64+
5965
properties:
6066
compatible:
6167
items:
@@ -64,6 +70,8 @@ patternProperties:
6470

6571
"^phy@[0-9a-f]+$":
6672
type: object
73+
additionalProperties: true
74+
6775
properties:
6876
compatible:
6977
const: qcom,dsi-phy-10nm

Documentation/devicetree/bindings/display/msm/qcom,sc7280-mdss.yaml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,18 +44,24 @@ properties:
4444
patternProperties:
4545
"^display-controller@[0-9a-f]+$":
4646
type: object
47+
additionalProperties: true
48+
4749
properties:
4850
compatible:
4951
const: qcom,sc7280-dpu
5052

5153
"^displayport-controller@[0-9a-f]+$":
5254
type: object
55+
additionalProperties: true
56+
5357
properties:
5458
compatible:
5559
const: qcom,sc7280-dp
5660

5761
"^dsi@[0-9a-f]+$":
5862
type: object
63+
additionalProperties: true
64+
5965
properties:
6066
compatible:
6167
items:
@@ -64,12 +70,16 @@ patternProperties:
6470

6571
"^edp@[0-9a-f]+$":
6672
type: object
73+
additionalProperties: true
74+
6775
properties:
6876
compatible:
6977
const: qcom,sc7280-edp
7078

7179
"^phy@[0-9a-f]+$":
7280
type: object
81+
additionalProperties: true
82+
7383
properties:
7484
compatible:
7585
enum:

Documentation/devicetree/bindings/display/msm/qcom,sc8280xp-mdss.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,16 @@ properties:
3434
patternProperties:
3535
"^display-controller@[0-9a-f]+$":
3636
type: object
37+
additionalProperties: true
38+
3739
properties:
3840
compatible:
3941
const: qcom,sc8280xp-dpu
4042

4143
"^displayport-controller@[0-9a-f]+$":
4244
type: object
45+
additionalProperties: true
46+
4347
properties:
4448
compatible:
4549
enum:

Documentation/devicetree/bindings/display/msm/qcom,sdm845-mdss.yaml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,18 +42,24 @@ properties:
4242
patternProperties:
4343
"^display-controller@[0-9a-f]+$":
4444
type: object
45+
additionalProperties: true
46+
4547
properties:
4648
compatible:
4749
const: qcom,sdm845-dpu
4850

4951
"^displayport-controller@[0-9a-f]+$":
5052
type: object
53+
additionalProperties: true
54+
5155
properties:
5256
compatible:
5357
const: qcom,sdm845-dp
5458

5559
"^dsi@[0-9a-f]+$":
5660
type: object
61+
additionalProperties: true
62+
5763
properties:
5864
compatible:
5965
items:
@@ -62,6 +68,8 @@ patternProperties:
6268

6369
"^phy@[0-9a-f]+$":
6470
type: object
71+
additionalProperties: true
72+
6573
properties:
6674
compatible:
6775
const: qcom,dsi-phy-10nm

Documentation/devicetree/bindings/display/msm/qcom,sm6115-mdss.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,16 @@ properties:
3232
patternProperties:
3333
"^display-controller@[0-9a-f]+$":
3434
type: object
35+
additionalProperties: true
36+
3537
properties:
3638
compatible:
3739
const: qcom,sm6115-dpu
3840

3941
"^dsi@[0-9a-f]+$":
4042
type: object
43+
additionalProperties: true
44+
4145
properties:
4246
compatible:
4347
oneOf:
@@ -50,6 +54,8 @@ patternProperties:
5054

5155
"^phy@[0-9a-f]+$":
5256
type: object
57+
additionalProperties: true
58+
5359
properties:
5460
compatible:
5561
const: qcom,dsi-phy-14nm-2290

0 commit comments

Comments
 (0)