Skip to content

Commit 6dc1d3c

Browse files
committed
Merge tag 'drm-misc-next-2025-09-04' of https://gitlab.freedesktop.org/drm/misc/kernel into drm-next
drm-misc-next for v6.18: Cross-subsystem Changes: - Update a number of DT bindings for STM32MP25 Arm SoC Core Changes: gem: - Simplify locking for GPUVM panel-backlight-quirks: - Add additional quirks for EDID, DMI, brightness sched: - Fix race condition in trace code - Clean up sysfb: - Clean up Driver Changes: amdgpu: - Give kernel jobs a unique id for better tracing amdxdna: - Improve error reporting bridge: - Improve ref counting on bridge management - adv7511: Provide SPD and HDMI infoframes - it6505: Replace crypto_shash with sha() - synopsys: Add support for DW DPTX Controller plus DT bindings gud: - Replace simple-KMS pipe with regular atomic helpers imagination: - Improve power management - Add support for TH1520 GPU - Support Risc-V architectures ivpu: - Clean up nouveau: - Improve error reporting panthor: - Fail VM bind if BO has offset - Clean up rcar-du: - Make number of lanes configurable rockchip: - Add support for RK3588 DPTX output rocket: - Use kfree() and sizeof() correctly - Test DMA status - Clean up sitronix: - st7571-i2c: Add support for inverted displays and 2-bit grayscale - Clean up stm: - ltdc: Add support support for STM32MP257F-EV1 plus DT bindings tidss: - Convert to kernel's FIELD_ macros v3d: - Improve job management and locking Signed-off-by: Dave Airlie <airlied@redhat.com> From: Thomas Zimmermann <tzimmermann@suse.de> Link: https://lore.kernel.org/r/20250904090932.GA193997@linux.fritz.box
2 parents 4bf83dd + 2a1eea8 commit 6dc1d3c

99 files changed

Lines changed: 3871 additions & 700 deletions

File tree

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/arm/stm32/st,stm32-syscon.yaml

Lines changed: 21 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -36,20 +36,31 @@ properties:
3636
clocks:
3737
maxItems: 1
3838

39+
"#clock-cells":
40+
const: 0
41+
3942
required:
4043
- compatible
4144
- reg
4245

43-
if:
44-
properties:
45-
compatible:
46-
contains:
47-
enum:
48-
- st,stm32mp157-syscfg
49-
- st,stm32f4-gcan
50-
then:
51-
required:
52-
- clocks
46+
allOf:
47+
- if:
48+
properties:
49+
compatible:
50+
contains:
51+
enum:
52+
- st,stm32mp157-syscfg
53+
- st,stm32f4-gcan
54+
then:
55+
required:
56+
- clocks
57+
- if:
58+
properties:
59+
compatible:
60+
const: st,stm32mp25-syscfg
61+
then:
62+
required:
63+
- "#clock-cells"
5364

5465
additionalProperties: false
5566

Lines changed: 150 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,150 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/display/rockchip/rockchip,dw-dp.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Rockchip DW DisplayPort Transmitter
8+
9+
maintainers:
10+
- Andy Yan <andy.yan@rock-chips.com>
11+
12+
description: |
13+
The Rockchip RK3588 SoC integrates the Synopsys DesignWare DPTX controller
14+
which is compliant with the DisplayPort Specification Version 1.4 with the
15+
following features:
16+
17+
* DisplayPort 1.4a
18+
* Main Link: 1/2/4 lanes
19+
* Main Link Support 1.62Gbps, 2.7Gbps, 5.4Gbps and 8.1Gbps
20+
* AUX channel 1Mbps
21+
* Single Stream Transport(SST)
22+
* Multistream Transport (MST)
23+
* Type-C support (alternate mode)
24+
* HDCP 2.2, HDCP 1.3
25+
* Supports up to 8/10 bits per color component
26+
* Supports RBG, YCbCr4:4:4, YCbCr4:2:2, YCbCr4:2:0
27+
* Pixel clock up to 594MHz
28+
* I2S, SPDIF audio interface
29+
30+
allOf:
31+
- $ref: /schemas/sound/dai-common.yaml#
32+
33+
properties:
34+
compatible:
35+
enum:
36+
- rockchip,rk3588-dp
37+
38+
reg:
39+
maxItems: 1
40+
41+
interrupts:
42+
maxItems: 1
43+
44+
clocks:
45+
items:
46+
- description: Peripheral/APB bus clock
47+
- description: DisplayPort AUX clock
48+
- description: HDCP clock
49+
- description: I2S interface clock
50+
- description: SPDIF interfce clock
51+
52+
clock-names:
53+
items:
54+
- const: apb
55+
- const: aux
56+
- const: hdcp
57+
- const: i2s
58+
- const: spdif
59+
60+
phys:
61+
maxItems: 1
62+
63+
ports:
64+
$ref: /schemas/graph.yaml#/properties/ports
65+
66+
properties:
67+
port@0:
68+
$ref: /schemas/graph.yaml#/properties/port
69+
description: Video port for RGB/YUV input.
70+
71+
port@1:
72+
$ref: /schemas/graph.yaml#/properties/port
73+
description: Video port for DP output.
74+
75+
required:
76+
- port@0
77+
- port@1
78+
79+
power-domains:
80+
maxItems: 1
81+
82+
resets:
83+
maxItems: 1
84+
85+
"#sound-dai-cells":
86+
const: 0
87+
88+
required:
89+
- compatible
90+
- reg
91+
- clocks
92+
- clock-names
93+
- interrupts
94+
- phys
95+
- ports
96+
- resets
97+
98+
unevaluatedProperties: false
99+
100+
examples:
101+
- |
102+
#include <dt-bindings/clock/rockchip,rk3588-cru.h>
103+
#include <dt-bindings/phy/phy.h>
104+
#include <dt-bindings/interrupt-controller/arm-gic.h>
105+
#include <dt-bindings/interrupt-controller/irq.h>
106+
#include <dt-bindings/power/rk3588-power.h>
107+
#include <dt-bindings/reset/rockchip,rk3588-cru.h>
108+
109+
soc {
110+
#address-cells = <2>;
111+
#size-cells = <2>;
112+
113+
dp@fde50000 {
114+
compatible = "rockchip,rk3588-dp";
115+
reg = <0x0 0xfde50000 0x0 0x4000>;
116+
interrupts = <GIC_SPI 161 IRQ_TYPE_LEVEL_HIGH 0>;
117+
clocks = <&cru PCLK_DP0>, <&cru CLK_AUX16M_0>,
118+
<&cru CLK_DP0>, <&cru MCLK_I2S4_8CH_TX>,
119+
<&cru MCLK_SPDIF2_DP0>;
120+
clock-names = "apb", "aux", "hdcp", "i2s", "spdif";
121+
assigned-clocks = <&cru CLK_AUX16M_0>;
122+
assigned-clock-rates = <16000000>;
123+
resets = <&cru SRST_DP0>;
124+
phys = <&usbdp_phy0 PHY_TYPE_DP>;
125+
power-domains = <&power RK3588_PD_VO0>;
126+
#sound-dai-cells = <0>;
127+
128+
129+
ports {
130+
#address-cells = <1>;
131+
#size-cells = <0>;
132+
133+
port@0 {
134+
reg = <0>;
135+
136+
dp0_in_vp2: endpoint {
137+
remote-endpoint = <&vp2_out_dp0>;
138+
};
139+
};
140+
141+
port@1 {
142+
reg = <1>;
143+
144+
dp0_out_con0: endpoint {
145+
remote-endpoint = <&dp_con0_in>;
146+
};
147+
};
148+
};
149+
};
150+
};

Documentation/devicetree/bindings/display/sitronix,st7567.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,11 @@ properties:
2323
reg:
2424
maxItems: 1
2525

26+
sitronix,inverted:
27+
type: boolean
28+
description:
29+
Display pixels are inverted, i.e. 0 is white and 1 is black.
30+
2631
width-mm: true
2732
height-mm: true
2833
panel-timing: true

Documentation/devicetree/bindings/display/sitronix,st7571.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,11 @@ properties:
2828
description:
2929
Display supports 4-level grayscale.
3030

31+
sitronix,inverted:
32+
type: boolean
33+
description:
34+
Display pixels are inverted, i.e. 0 is white and 1 is black.
35+
3136
reset-gpios: true
3237
width-mm: true
3338
height-mm: true

Documentation/devicetree/bindings/display/st,stm32-ltdc.yaml

Lines changed: 53 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,10 @@ maintainers:
1212

1313
properties:
1414
compatible:
15-
const: st,stm32-ltdc
15+
enum:
16+
- st,stm32-ltdc
17+
- st,stm32mp251-ltdc
18+
- st,stm32mp255-ltdc
1619

1720
reg:
1821
maxItems: 1
@@ -24,15 +27,23 @@ properties:
2427
minItems: 1
2528

2629
clocks:
27-
maxItems: 1
30+
minItems: 1
31+
maxItems: 4
2832

2933
clock-names:
3034
items:
3135
- const: lcd
36+
- const: bus
37+
- const: ref
38+
- const: lvds
39+
minItems: 1
3240

3341
resets:
3442
maxItems: 1
3543

44+
access-controllers:
45+
maxItems: 1
46+
3647
port:
3748
$ref: /schemas/graph.yaml#/properties/port
3849
description: |
@@ -51,6 +62,46 @@ required:
5162
- resets
5263
- port
5364

65+
allOf:
66+
- if:
67+
properties:
68+
compatible:
69+
contains:
70+
enum:
71+
- st,stm32-ltdc
72+
then:
73+
properties:
74+
clocks:
75+
maxItems: 1
76+
clock-names:
77+
maxItems: 1
78+
- if:
79+
properties:
80+
compatible:
81+
contains:
82+
enum:
83+
- st,stm32mp251-ltdc
84+
then:
85+
properties:
86+
clocks:
87+
minItems: 2
88+
maxItems: 2
89+
clock-names:
90+
minItems: 2
91+
maxItems: 2
92+
- if:
93+
properties:
94+
compatible:
95+
contains:
96+
enum:
97+
- st,stm32mp255-ltdc
98+
then:
99+
properties:
100+
clocks:
101+
minItems: 4
102+
clock-names:
103+
minItems: 4
104+
54105
additionalProperties: false
55106

56107
examples:

Documentation/devicetree/bindings/display/st,stm32mp25-lvds.yaml

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,12 @@ description: |
3131
3232
properties:
3333
compatible:
34-
const: st,stm32mp25-lvds
34+
oneOf:
35+
- items:
36+
- enum:
37+
- st,stm32mp255-lvds
38+
- const: st,stm32mp25-lvds
39+
- const: st,stm32mp25-lvds
3540

3641
"#clock-cells":
3742
const: 0
@@ -54,6 +59,12 @@ properties:
5459
resets:
5560
maxItems: 1
5661

62+
access-controllers:
63+
maxItems: 1
64+
65+
power-domains:
66+
maxItems: 1
67+
5768
ports:
5869
$ref: /schemas/graph.yaml#/properties/ports
5970

0 commit comments

Comments
 (0)