Skip to content

Commit 203dcde

Browse files
committed
Merge tag 'drm-msm-next-2025-07-05' of https://gitlab.freedesktop.org/drm/msm into drm-next
Updates for v6.17 CI: - uprev mesa and ci-templates - use shallow clone to speed up build jobs - remove sdm845/cheza jobs. These runners are no more (RIP dear chezas) - fix runner tag for i915 cml runners - uprev igt to pull in msm test fixes Core: - VM_BIND support! - single source of truth for UBWC configuration. Adds a global soc driver for UBWC config which is used from display and GPU. (And later vidc/camera/etc) - Decouple ties between GPU and KMS, adding a `separate_gpu_kms` modparam to allow the GPU and KMS to bind to separate DRM devices. This should better deal with more exotic SoC configurations where the number of GPUs is different from number of DPUs. The default behavior is to still come up as a single unified DRM device to avoid surprising userspace. DP: - major rework of the I/O accessors DPU: - use version checks instead of feature bits - SM8750 support - set min_prefill_lines for SC8180X DSI: - SM8750 support GPU: - speedbin support for X1-85 - X1-45 support MDSS: - SM8750 support Signed-off-by: Simona Vetter <[email protected]> From: Robin Clark <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/CACSVV0217R+kpoWQJeuYGHf6q_4aFyEJuKa=dZZKOnLQzFwppg@mail.gmail.com
2 parents 69d09a2 + 8290d37 commit 203dcde

File tree

179 files changed

+11379
-8072
lines changed

Some content is hidden

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

179 files changed

+11379
-8072
lines changed

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,10 @@ properties:
3838
- qcom,sm8450-dp
3939
- qcom,sm8550-dp
4040
- const: qcom,sm8350-dp
41+
- items:
42+
- enum:
43+
- qcom,sm8750-dp
44+
- const: qcom,sm8650-dp
4145

4246
reg:
4347
minItems: 4

Documentation/devicetree/bindings/display/msm/dsi-controller-main.yaml

Lines changed: 49 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ properties:
4242
- qcom,sm8450-dsi-ctrl
4343
- qcom,sm8550-dsi-ctrl
4444
- qcom,sm8650-dsi-ctrl
45+
- qcom,sm8750-dsi-ctrl
4546
- const: qcom,mdss-dsi-ctrl
4647
- enum:
4748
- qcom,dsi-ctrl-6g-qcm2290
@@ -70,11 +71,11 @@ properties:
7071
- mnoc:: MNOC clock
7172
- pixel:: Display pixel clock.
7273
minItems: 3
73-
maxItems: 9
74+
maxItems: 12
7475

7576
clock-names:
7677
minItems: 3
77-
maxItems: 9
78+
maxItems: 12
7879

7980
phys:
8081
maxItems: 1
@@ -109,7 +110,8 @@ properties:
109110
minItems: 2
110111
maxItems: 4
111112
description: |
112-
Parents of "byte" and "pixel" for the given platform.
113+
For DSI on SM8650 and older: parents of "byte" and "pixel" for the given
114+
platform.
113115
For DSIv2 platforms this should contain "byte", "esc", "src" and
114116
"pixel_src" clocks.
115117
@@ -218,8 +220,6 @@ required:
218220
- clocks
219221
- clock-names
220222
- phys
221-
- assigned-clocks
222-
- assigned-clock-parents
223223
- ports
224224

225225
allOf:
@@ -244,6 +244,9 @@ allOf:
244244
- const: byte
245245
- const: pixel
246246
- const: core
247+
required:
248+
- assigned-clocks
249+
- assigned-clock-parents
247250

248251
- if:
249252
properties:
@@ -266,6 +269,9 @@ allOf:
266269
- const: byte
267270
- const: pixel
268271
- const: core
272+
required:
273+
- assigned-clocks
274+
- assigned-clock-parents
269275

270276
- if:
271277
properties:
@@ -288,6 +294,9 @@ allOf:
288294
- const: pixel
289295
- const: core
290296
- const: core_mmss
297+
required:
298+
- assigned-clocks
299+
- assigned-clock-parents
291300

292301
- if:
293302
properties:
@@ -309,6 +318,9 @@ allOf:
309318
- const: core_mmss
310319
- const: pixel
311320
- const: core
321+
required:
322+
- assigned-clocks
323+
- assigned-clock-parents
312324

313325
- if:
314326
properties:
@@ -346,6 +358,35 @@ allOf:
346358
- const: core
347359
- const: iface
348360
- const: bus
361+
required:
362+
- assigned-clocks
363+
- assigned-clock-parents
364+
365+
- if:
366+
properties:
367+
compatible:
368+
contains:
369+
enum:
370+
- qcom,sm8750-dsi-ctrl
371+
then:
372+
properties:
373+
clocks:
374+
minItems: 12
375+
maxItems: 12
376+
clock-names:
377+
items:
378+
- const: byte
379+
- const: byte_intf
380+
- const: pixel
381+
- const: core
382+
- const: iface
383+
- const: bus
384+
- const: dsi_pll_pixel
385+
- const: dsi_pll_byte
386+
- const: esync
387+
- const: osc
388+
- const: byte_src
389+
- const: pixel_src
349390

350391
- if:
351392
properties:
@@ -369,6 +410,9 @@ allOf:
369410
- const: core_mmss
370411
- const: pixel
371412
- const: core
413+
required:
414+
- assigned-clocks
415+
- assigned-clock-parents
372416

373417
unevaluatedProperties: false
374418

Documentation/devicetree/bindings/display/msm/dsi-phy-7nm.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ properties:
2525
- qcom,sm8450-dsi-phy-5nm
2626
- qcom,sm8550-dsi-phy-4nm
2727
- qcom,sm8650-dsi-phy-4nm
28+
- qcom,sm8750-dsi-phy-3nm
2829

2930
reg:
3031
items:

Documentation/devicetree/bindings/display/msm/qcom,sm8650-dpu.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ properties:
1616
enum:
1717
- qcom,sa8775p-dpu
1818
- qcom,sm8650-dpu
19+
- qcom,sm8750-dpu
1920
- qcom,x1e80100-dpu
2021

2122
reg:

0 commit comments

Comments
 (0)