Skip to content

Commit ee31621

Browse files
committed
Merge tag 'drm-msm-next-2025-11-18' of https://gitlab.freedesktop.org/drm/msm into drm-next
Changes for v6.19: GPU: - Gen8 support: A840 (Kaanapali) and X2-85 (Glymur) - A612 support - A few NULL check fixes MDSS: - Added support for Glymur and QCS8300 platforms DPU: - Enabled Quad-Pipe support, unlocking higher resolutions support - Added support for Glymur platform - Documented DPU on QCS8300 platform as supported - Misc small fixes DisplayPort: - Added support for Glymur platform - Added support lame remapping inside DP block - Documented DisplayPort controller on QCS8300 and SM6150/QCS615 as supported Signed-off-by: Dave Airlie <airlied@redhat.com> From: Rob Clark <rob.clark@oss.qualcomm.com> Link: https://patch.msgid.link/CACSVV00sFi65XrZipHCU3C0bYji7vgu7OgWvLeOQ1Cg475_pUA@mail.gmail.com
2 parents ce0478b + 7bc29d5 commit ee31621

71 files changed

Lines changed: 7359 additions & 2267 deletions

Some content is hidden

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

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

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ properties:
1818
compatible:
1919
oneOf:
2020
- enum:
21+
- qcom,glymur-dp
2122
- qcom,sa8775p-dp
2223
- qcom,sc7180-dp
2324
- qcom,sc7280-dp
@@ -31,6 +32,11 @@ properties:
3132
- qcom,sm8650-dp
3233
- qcom,x1e80100-dp
3334

35+
- items:
36+
- enum:
37+
- qcom,qcs8300-dp
38+
- const: qcom,sa8775p-dp
39+
3440
- items:
3541
- enum:
3642
- qcom,sm6350-dp
@@ -53,6 +59,12 @@ properties:
5359
- qcom,sm8550-dp
5460
- const: qcom,sm8350-dp
5561

62+
- items:
63+
- enum:
64+
- qcom,sm6150-dp
65+
- const: qcom,sm8150-dp
66+
- const: qcom,sm8350-dp
67+
5668
- items:
5769
- enum:
5870
- qcom,sm8750-dp
@@ -195,9 +207,11 @@ allOf:
195207
compatible:
196208
contains:
197209
enum:
210+
- qcom,glymur-dp
198211
- qcom,sa8775p-dp
199212
- qcom,x1e80100-dp
200213
then:
214+
$ref: /schemas/sound/dai-common.yaml#
201215
oneOf:
202216
- required:
203217
- aux-bus
@@ -239,6 +253,7 @@ allOf:
239253
enum:
240254
# these platforms support 2 streams MST on some interfaces,
241255
# others are SST only
256+
- qcom,glymur-dp
242257
- qcom,sc8280xp-dp
243258
- qcom,x1e80100-dp
244259
then:
@@ -295,7 +310,7 @@ allOf:
295310
minItems: 6
296311
maxItems: 8
297312

298-
additionalProperties: false
313+
unevaluatedProperties: false
299314

300315
examples:
301316
- |

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

Lines changed: 59 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-[67][0-9][0-9]\.[0-9]$'
24+
- pattern: '^qcom,adreno-gmu-[6-8][0-9][0-9]\.[0-9]$'
2525
- const: qcom,adreno-gmu
2626
- items:
2727
- pattern: '^qcom,adreno-gmu-x[1-9][0-9][0-9]\.[0-9]$'
@@ -299,6 +299,64 @@ allOf:
299299
required:
300300
- qcom,qmp
301301

302+
- if:
303+
properties:
304+
compatible:
305+
contains:
306+
const: qcom,adreno-gmu-840.1
307+
then:
308+
properties:
309+
reg:
310+
items:
311+
- description: Core GMU registers
312+
reg-names:
313+
items:
314+
- const: gmu
315+
clocks:
316+
items:
317+
- description: GPU AHB clock
318+
- description: GMU clock
319+
- description: GPU CX clock
320+
- description: GPU MEMNOC clock
321+
- description: GMU HUB clock
322+
clock-names:
323+
items:
324+
- const: ahb
325+
- const: gmu
326+
- const: cxo
327+
- const: memnoc
328+
- const: hub
329+
330+
- if:
331+
properties:
332+
compatible:
333+
contains:
334+
const: qcom,adreno-gmu-x285.1
335+
then:
336+
properties:
337+
reg:
338+
items:
339+
- description: Core GMU registers
340+
reg-names:
341+
items:
342+
- const: gmu
343+
clocks:
344+
items:
345+
- description: GPU AHB clock
346+
- description: GMU clock
347+
- description: GPU CX clock
348+
- description: GPU MEMNOC clock
349+
- description: GMU HUB clock
350+
- description: GMU RSCC HUB clock
351+
clock-names:
352+
items:
353+
- const: ahb
354+
- const: gmu
355+
- const: cxo
356+
- const: memnoc
357+
- const: hub
358+
- const: rscc
359+
302360
- if:
303361
properties:
304362
compatible:

0 commit comments

Comments
 (0)