Skip to content

Commit d65a27f

Browse files
committed
Merge tag 'drm-misc-next-2025-03-06' of https://gitlab.freedesktop.org/drm/misc/kernel into drm-next
drm-misc-next for v6.15: Cross-subsystem Changes: base: - component: Provide helper to query bound status fbdev: - fbtft: Remove access to page->index Core Changes: - Fix usage of logging macros in several places gem: - Add test function for imported dma-bufs and use it in core and helpers - Avoid struct drm_gem_object.import_attach tests: - Fix lockdep warnings ttm: - Add helpers for TTM shrinker Driver Changes: adp: - Add support for Apple Touch Bar displays on M1/M2 amdxdna: - Fix interrupt handling appletbdrm: - Add support for Apple Touch Bar displays on x86 bridge: - synopsys: Add HDMI audio support - ti-sn65dsi83: Support negative DE polarity ipu-v3: - Remove unused code nouveau: - Avoid multiple -Wflex-array-member-not-at-end warnings panthor: - Fix CS_STATUS_ defines - Improve locking rockchip: - analogix_dp: Add eDP support - lvds: Improve logging - vop2: Improve HDMI mode handling; Add support for RK3576 - Fix shutdown - Support rk3562-mali xe: - Use TTM shrinker Signed-off-by: Dave Airlie <airlied@redhat.com> From: Thomas Zimmermann <tzimmermann@suse.de> Link: https://patchwork.freedesktop.org/patch/msgid/20250306130700.GA485504@linux.fritz.box
2 parents e21cba7 + 4423e60 commit d65a27f

File tree

94 files changed

+7433
-2257
lines changed

Some content is hidden

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

94 files changed

+7433
-2257
lines changed
Lines changed: 83 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,83 @@
1+
# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/display/apple,h7-display-pipe-mipi.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Apple pre-DCP display controller MIPI interface
8+
9+
maintainers:
10+
- Sasha Finkelstein <fnkl.kernel@gmail.com>
11+
12+
description:
13+
The MIPI controller part of the pre-DCP Apple display controller
14+
15+
allOf:
16+
- $ref: dsi-controller.yaml#
17+
18+
properties:
19+
compatible:
20+
items:
21+
- enum:
22+
- apple,t8112-display-pipe-mipi
23+
- apple,t8103-display-pipe-mipi
24+
- const: apple,h7-display-pipe-mipi
25+
26+
reg:
27+
maxItems: 1
28+
29+
power-domains:
30+
maxItems: 1
31+
32+
ports:
33+
$ref: /schemas/graph.yaml#/properties/ports
34+
35+
properties:
36+
port@0:
37+
$ref: /schemas/graph.yaml#/properties/port
38+
description: Input port. Always connected to the primary controller
39+
40+
port@1:
41+
$ref: /schemas/graph.yaml#/properties/port
42+
description: Output MIPI DSI port to the panel
43+
44+
required:
45+
- port@0
46+
- port@1
47+
48+
required:
49+
- compatible
50+
- reg
51+
- ports
52+
53+
unevaluatedProperties: false
54+
55+
examples:
56+
- |
57+
dsi@28200000 {
58+
compatible = "apple,t8103-display-pipe-mipi", "apple,h7-display-pipe-mipi";
59+
reg = <0x28200000 0xc000>;
60+
power-domains = <&ps_dispdfr_mipi>;
61+
62+
ports {
63+
#address-cells = <1>;
64+
#size-cells = <0>;
65+
66+
port@0 {
67+
reg = <0>;
68+
69+
dfr_adp_out_mipi: endpoint {
70+
remote-endpoint = <&dfr_adp_out_mipi>;
71+
};
72+
};
73+
74+
port@1 {
75+
reg = <1>;
76+
77+
dfr_panel_in: endpoint {
78+
remote-endpoint = <&dfr_mipi_out_panel>;
79+
};
80+
};
81+
};
82+
};
83+
...
Lines changed: 88 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,88 @@
1+
# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/display/apple,h7-display-pipe.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Apple pre-DCP display controller
8+
9+
maintainers:
10+
- Sasha Finkelstein <fnkl.kernel@gmail.com>
11+
12+
description:
13+
A secondary display controller used to drive the "touchbar" on
14+
certain Apple laptops.
15+
16+
properties:
17+
compatible:
18+
items:
19+
- enum:
20+
- apple,t8112-display-pipe
21+
- apple,t8103-display-pipe
22+
- const: apple,h7-display-pipe
23+
24+
reg:
25+
items:
26+
- description: Primary register block, controls planes and blending
27+
- description:
28+
Contains other configuration registers like interrupt
29+
and FIFO control
30+
31+
reg-names:
32+
items:
33+
- const: be
34+
- const: fe
35+
36+
power-domains:
37+
description:
38+
Phandles to pmgr entries that are needed for this controller to turn on.
39+
Aside from that, their specific functions are unknown
40+
maxItems: 2
41+
42+
interrupts:
43+
items:
44+
- description: Unknown function
45+
- description: Primary interrupt. Vsync events are reported via it
46+
47+
interrupt-names:
48+
items:
49+
- const: be
50+
- const: fe
51+
52+
iommus:
53+
maxItems: 1
54+
55+
port:
56+
$ref: /schemas/graph.yaml#/properties/port
57+
description: Output port. Always connected to apple,h7-display-pipe-mipi
58+
59+
required:
60+
- compatible
61+
- reg
62+
- interrupts
63+
- port
64+
65+
additionalProperties: false
66+
67+
examples:
68+
- |
69+
#include <dt-bindings/interrupt-controller/apple-aic.h>
70+
display-pipe@28200000 {
71+
compatible = "apple,t8103-display-pipe", "apple,h7-display-pipe";
72+
reg = <0x28200000 0xc000>,
73+
<0x28400000 0x4000>;
74+
reg-names = "be", "fe";
75+
power-domains = <&ps_dispdfr_fe>, <&ps_dispdfr_be>;
76+
interrupt-parent = <&aic>;
77+
interrupts = <AIC_IRQ 502 IRQ_TYPE_LEVEL_HIGH>,
78+
<AIC_IRQ 506 IRQ_TYPE_LEVEL_HIGH>;
79+
interrupt-names = "be", "fe";
80+
iommus = <&displaydfr_dart 0>;
81+
82+
port {
83+
dfr_adp_out_mipi: endpoint {
84+
remote-endpoint = <&dfr_mipi_in_adp>;
85+
};
86+
};
87+
};
88+
...
Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/display/panel/apple,summit.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Apple "Summit" display panel
8+
9+
maintainers:
10+
- Sasha Finkelstein <fnkl.kernel@gmail.com>
11+
12+
description:
13+
An OLED panel used as a touchbar on certain Apple laptops.
14+
Contains a backlight device, which controls brightness of the panel itself.
15+
The backlight common properties are included for this reason
16+
17+
allOf:
18+
- $ref: panel-common.yaml#
19+
- $ref: /schemas/leds/backlight/common.yaml#
20+
21+
properties:
22+
compatible:
23+
items:
24+
- enum:
25+
- apple,j293-summit
26+
- apple,j493-summit
27+
- const: apple,summit
28+
29+
reg:
30+
maxItems: 1
31+
32+
required:
33+
- compatible
34+
- reg
35+
- max-brightness
36+
- port
37+
38+
unevaluatedProperties: false
39+
40+
examples:
41+
- |
42+
dsi {
43+
#address-cells = <1>;
44+
#size-cells = <0>;
45+
46+
panel@0 {
47+
compatible = "apple,j293-summit", "apple,summit";
48+
reg = <0>;
49+
max-brightness = <255>;
50+
51+
port {
52+
endpoint {
53+
remote-endpoint = <&dfr_bridge_out>;
54+
};
55+
};
56+
};
57+
};
58+
...

Documentation/devicetree/bindings/display/rockchip/rockchip-vop2.yaml

Lines changed: 85 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,14 @@ description:
1414
maintainers:
1515
- Sandy Huang <hjc@rock-chips.com>
1616
- Heiko Stuebner <heiko@sntech.de>
17+
- Andy Yan <andyshrk@163.com>
1718

1819
properties:
1920
compatible:
2021
enum:
2122
- rockchip,rk3566-vop
2223
- rockchip,rk3568-vop
24+
- rockchip,rk3576-vop
2325
- rockchip,rk3588-vop
2426

2527
reg:
@@ -37,10 +39,21 @@ properties:
3739
- const: gamma-lut
3840

3941
interrupts:
40-
maxItems: 1
42+
minItems: 1
43+
maxItems: 4
4144
description:
42-
The VOP interrupt is shared by several interrupt sources, such as
43-
frame start (VSYNC), line flag and other status interrupts.
45+
For VOP version under rk3576, the interrupt is shared by several interrupt
46+
sources, such as frame start (VSYNC), line flag and other interrupt status.
47+
For VOP version from rk3576 there is a system interrupt for bus error, and
48+
every video port has it's independent interrupts for vsync and other video
49+
port related error interrupts.
50+
51+
interrupt-names:
52+
items:
53+
- const: sys
54+
- const: vp0
55+
- const: vp1
56+
- const: vp2
4457

4558
# See compatible-specific constraints below.
4659
clocks:
@@ -124,43 +137,100 @@ allOf:
124137
properties:
125138
compatible:
126139
contains:
127-
const: rockchip,rk3588-vop
140+
enum:
141+
- rockchip,rk3566-vop
142+
- rockchip,rk3568-vop
128143
then:
129144
properties:
130145
clocks:
131-
minItems: 7
146+
maxItems: 5
147+
132148
clock-names:
133-
minItems: 7
149+
maxItems: 5
150+
151+
interrupts:
152+
maxItems: 1
153+
154+
interrupt-names: false
134155

135156
ports:
136157
required:
137158
- port@0
138159
- port@1
139160
- port@2
140-
- port@3
161+
162+
rockchip,vo1-grf: false
163+
rockchip,vop-grf: false
164+
rockchip,pmu: false
141165

142166
required:
143167
- rockchip,grf
144-
- rockchip,vo1-grf
145-
- rockchip,vop-grf
146-
- rockchip,pmu
147168

148-
else:
169+
- if:
170+
properties:
171+
compatible:
172+
contains:
173+
enum:
174+
- rockchip,rk3576-vop
175+
then:
149176
properties:
177+
clocks:
178+
maxItems: 5
179+
180+
clock-names:
181+
maxItems: 5
182+
183+
interrupts:
184+
minItems: 4
185+
186+
interrupt-names:
187+
minItems: 4
188+
189+
ports:
190+
required:
191+
- port@0
192+
- port@1
193+
- port@2
194+
150195
rockchip,vo1-grf: false
151196
rockchip,vop-grf: false
152-
rockchip,pmu: false
153197

198+
required:
199+
- rockchip,grf
200+
- rockchip,pmu
201+
202+
- if:
203+
properties:
204+
compatible:
205+
contains:
206+
const: rockchip,rk3588-vop
207+
then:
208+
properties:
154209
clocks:
155-
maxItems: 5
210+
minItems: 7
211+
maxItems: 9
212+
156213
clock-names:
157-
maxItems: 5
214+
minItems: 7
215+
maxItems: 9
216+
217+
interrupts:
218+
maxItems: 1
219+
220+
interrupt-names: false
158221

159222
ports:
160223
required:
161224
- port@0
162225
- port@1
163226
- port@2
227+
- port@3
228+
229+
required:
230+
- rockchip,grf
231+
- rockchip,vo1-grf
232+
- rockchip,vop-grf
233+
- rockchip,pmu
164234

165235
additionalProperties: false
166236

@@ -188,6 +258,7 @@ examples:
188258
"dclk_vp1",
189259
"dclk_vp2";
190260
power-domains = <&power RK3568_PD_VO>;
261+
rockchip,grf = <&grf>;
191262
iommus = <&vop_mmu>;
192263
vop_out: ports {
193264
#address-cells = <1>;

Documentation/devicetree/bindings/gpu/arm,mali-bifrost.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ properties:
2525
- renesas,r9a07g044-mali
2626
- renesas,r9a07g054-mali
2727
- rockchip,px30-mali
28+
- rockchip,rk3562-mali
2829
- rockchip,rk3568-mali
2930
- rockchip,rk3576-mali
3031
- const: arm,mali-bifrost # Mali Bifrost GPU model/revision is fully discoverable

0 commit comments

Comments
 (0)