Skip to content

Commit b3239df

Browse files
committed
Merge tag 'drm-misc-next-2025-12-01-1' of https://gitlab.freedesktop.org/drm/misc/kernel into drm-next
Extra drm-misc-next for v6.19-rc1: UAPI Changes: - Add support for drm colorop pipeline. - Add COLOR PIPELINE plane property. - Add DRM_CLIENT_CAP_PLANE_COLOR_PIPELINE. Cross-subsystem Changes: - Attempt to use higher order mappings in system heap allocator. - Always taint kernel with sw-sync. Core Changes: - Small fixes to drm/gem. - Support emergency restore to drm-client. - Allocate and release fb_info in single place. - Rework ttm pipelined eviction fence handling. Driver Changes: - Support the drm color pipeline in vkms, amdgfx. - Add NVJPG driver for tegra. - Assorted small fixes and updates to rockchip, bridge/dw-hdmi-qp, panthor. - Add ASL CS5263 DP-to-HDMI simple bridge. - Add and improve support for G LD070WX3-SL01 MIPI DSI, Samsung LTL106AL0, Samsung LTL106AL01, Raystar RFF500F-AWH-DNN, Winstar WF70A8SYJHLNGA, Wanchanglong w552946aaa, Samsung SOFEF00, Lenovo X13s panel. - Add support for it66122 to it66121. - Support mali-G1 gpu in panthor. Signed-off-by: Dave Airlie <airlied@redhat.com> From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Link: https://patch.msgid.link/aa5cbd50-7676-4a59-bbed-e8428af86804@linux.intel.com
2 parents 62433ef + db2bad9 commit b3239df

139 files changed

Lines changed: 7928 additions & 818 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/display/bridge/ite,it66121.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ properties:
1919
compatible:
2020
enum:
2121
- ite,it66121
22+
- ite,it66122
2223
- ite,it6610
2324

2425
reg:

Documentation/devicetree/bindings/display/bridge/simple-bridge.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,9 @@ properties:
2727
- const: adi,adv7123
2828
- enum:
2929
- adi,adv7123
30+
- asl-tek,cs5263
3031
- dumb-vga-dac
32+
- parade,ps185hdm
3133
- radxa,ra620
3234
- realtek,rtd2171
3335
- ti,opa362

Documentation/devicetree/bindings/display/panel/ilitek,ili9881c.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ properties:
2424
- raspberrypi,dsi-7inch
2525
- startek,kd050hdfia020
2626
- tdo,tl050hdv35
27+
- wanchanglong,w552946aaa
2728
- wanchanglong,w552946aba
2829
- const: ilitek,ili9881c
2930

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
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/lg,ld070wx3-sl01.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: LG Corporation 7" WXGA TFT LCD panel
8+
9+
maintainers:
10+
- Svyatoslav Ryhel <clamor95@gmail.com>
11+
12+
allOf:
13+
- $ref: panel-common.yaml#
14+
15+
properties:
16+
compatible:
17+
items:
18+
- const: lg,ld070wx3-sl01
19+
20+
reg:
21+
maxItems: 1
22+
23+
vdd-supply: true
24+
vcc-supply: true
25+
26+
backlight: true
27+
port: true
28+
29+
required:
30+
- compatible
31+
- vdd-supply
32+
- vcc-supply
33+
34+
additionalProperties: false
35+
36+
examples:
37+
- |
38+
#include <dt-bindings/gpio/gpio.h>
39+
40+
dsi {
41+
#address-cells = <1>;
42+
#size-cells = <0>;
43+
44+
panel@0 {
45+
compatible = "lg,ld070wx3-sl01";
46+
reg = <0>;
47+
48+
vdd-supply = <&vdd_3v3_lcd>;
49+
vcc-supply = <&vcc_1v8_lcd>;
50+
51+
backlight = <&backlight>;
52+
53+
port {
54+
endpoint {
55+
remote-endpoint = <&dsi0_out>;
56+
};
57+
};
58+
};
59+
};
60+
...

Documentation/devicetree/bindings/display/panel/panel-lvds.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,8 @@ properties:
5959
# Jenson Display BL-JT60050-01A 7" WSVGA (1024x600) color TFT LCD LVDS panel
6060
- jenson,bl-jt60050-01a
6161
- tbs,a711-panel
62+
# Winstar WF70A8SYJHLNGA 7" WSVGA (1024x600) color TFT LCD LVDS panel
63+
- winstar,wf70a8syjhlnga
6264

6365
- const: panel-lvds
6466

Documentation/devicetree/bindings/display/panel/panel-simple-dsi.yaml

Lines changed: 4 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@ description: |
1919
2020
If the panel is more advanced a dedicated binding file is required.
2121
22+
allOf:
23+
- $ref: panel-common.yaml#
24+
2225
properties:
2326

2427
compatible:
@@ -42,8 +45,6 @@ properties:
4245
- kingdisplay,kd097d04
4346
# LG ACX467AKM-7 4.95" 1080×1920 LCD Panel
4447
- lg,acx467akm-7
45-
# LG Corporation 7" WXGA TFT LCD panel
46-
- lg,ld070wx3-sl01
4748
# LG Corporation 5" HD TFT LCD panel
4849
- lg,lh500wx1-sd03
4950
# Lincoln LCD197 5" 1080x1920 LCD panel
@@ -56,8 +57,6 @@ properties:
5657
- panasonic,vvx10f034n00
5758
# Samsung s6e3fa7 1080x2220 based AMS559NK06 AMOLED panel
5859
- samsung,s6e3fa7-ams559nk06
59-
# Samsung sofef00 1080x2280 AMOLED panel
60-
- samsung,sofef00
6160
# Shangai Top Display Optoelectronics 7" TL070WSH30 1024x600 TFT LCD panel
6261
- tdo,tl070wsh30
6362

@@ -70,30 +69,12 @@ properties:
7069
reset-gpios: true
7170
port: true
7271
power-supply: true
73-
vddio-supply: true
74-
75-
allOf:
76-
- $ref: panel-common.yaml#
77-
- if:
78-
properties:
79-
compatible:
80-
enum:
81-
- samsung,sofef00
82-
then:
83-
properties:
84-
power-supply: false
85-
required:
86-
- vddio-supply
87-
else:
88-
properties:
89-
vddio-supply: false
90-
required:
91-
- power-supply
9272

9373
additionalProperties: false
9474

9575
required:
9676
- compatible
77+
- power-supply
9778
- reg
9879

9980
examples:

Documentation/devicetree/bindings/display/panel/panel-simple.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -270,6 +270,8 @@ properties:
270270
- qiaodian,qd43003c0-40
271271
# Shenzhen QiShenglong Industrialist Co., Ltd. Gopher 2b 4.3" 480(RGB)x272 TFT LCD panel
272272
- qishenglong,gopher2b-lcd
273+
# Raystar Optronics, Inc. RFF500F-AWH-DNN 5.0" TFT 840x480
274+
- raystar,rff500f-awh-dnn
273275
# Rocktech Displays Ltd. RK101II01D-CT 10.1" TFT 1280x800
274276
- rocktech,rk101ii01d-ct
275277
# Rocktech Display Ltd. RK070ER9427 800(RGB)x480 TFT LCD panel
@@ -278,6 +280,8 @@ properties:
278280
- rocktech,rk043fn48h
279281
# Samsung Electronics 10.1" WXGA (1280x800) TFT LCD panel
280282
- samsung,ltl101al01
283+
# Samsung Electronics 10.6" FWXGA (1366x768) TFT LCD panel
284+
- samsung,ltl106al01
281285
# Samsung Electronics 10.1" WSVGA TFT LCD panel
282286
- samsung,ltn101nt05
283287
# Satoz SAT050AT40H12R2 5.0" WVGA TFT LCD panel

Documentation/devicetree/bindings/display/panel/ronbo,rb070d30.yaml

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@ title: Ronbo RB070D30 DSI Display Panel
99
maintainers:
1010
- Maxime Ripard <mripard@kernel.org>
1111

12+
allOf:
13+
- $ref: panel-common.yaml#
14+
1215
properties:
1316
compatible:
1417
const: ronbo,rb070d30
@@ -20,10 +23,6 @@ properties:
2023
description: GPIO used for the power pin
2124
maxItems: 1
2225

23-
reset-gpios:
24-
description: GPIO used for the reset pin
25-
maxItems: 1
26-
2726
shlr-gpios:
2827
description: GPIO used for the shlr pin (horizontal flip)
2928
maxItems: 1
@@ -35,10 +34,6 @@ properties:
3534
vcc-lcd-supply:
3635
description: Power regulator
3736

38-
backlight:
39-
description: Backlight used by the panel
40-
$ref: /schemas/types.yaml#/definitions/phandle
41-
4237
required:
4338
- compatible
4439
- power-gpios
@@ -47,5 +42,6 @@ required:
4742
- shlr-gpios
4843
- updn-gpios
4944
- vcc-lcd-supply
45+
- port
5046

51-
additionalProperties: false
47+
unevaluatedProperties: false
Lines changed: 79 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,79 @@
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/samsung,sofef00.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Samsung SOFEF00 AMOLED DDIC
8+
9+
description: The SOFEF00 is display driver IC with connected panel.
10+
11+
maintainers:
12+
- David Heidelberg <david@ixit.cz>
13+
14+
allOf:
15+
- $ref: panel-common.yaml#
16+
17+
properties:
18+
compatible:
19+
items:
20+
- enum:
21+
# Samsung 6.01 inch, 1080x2160 pixels, 18:9 ratio
22+
- samsung,sofef00-ams601nt22
23+
# Samsung 6.28 inch, 1080x2280 pixels, 19:9 ratio
24+
- samsung,sofef00-ams628nw01
25+
- const: samsung,sofef00
26+
27+
reg:
28+
maxItems: 1
29+
30+
poc-supply:
31+
description: POC regulator
32+
33+
vci-supply:
34+
description: VCI regulator
35+
36+
vddio-supply:
37+
description: VDD regulator
38+
39+
required:
40+
- compatible
41+
- reset-gpios
42+
- poc-supply
43+
- vci-supply
44+
- vddio-supply
45+
46+
unevaluatedProperties: false
47+
48+
examples:
49+
- |
50+
#include <dt-bindings/gpio/gpio.h>
51+
52+
dsi {
53+
#address-cells = <1>;
54+
#size-cells = <0>;
55+
56+
panel@0 {
57+
compatible = "samsung,sofef00-ams628nw01", "samsung,sofef00";
58+
reg = <0>;
59+
60+
vddio-supply = <&vreg_l14a_1p88>;
61+
vci-supply = <&s2dos05_buck1>;
62+
poc-supply = <&s2dos05_ldo1>;
63+
64+
te-gpios = <&tlmm 10 GPIO_ACTIVE_HIGH>;
65+
reset-gpios = <&tlmm 6 GPIO_ACTIVE_HIGH>;
66+
67+
pinctrl-0 = <&panel_active>;
68+
pinctrl-1 = <&panel_suspend>;
69+
pinctrl-names = "default", "sleep";
70+
71+
port {
72+
panel_in: endpoint {
73+
remote-endpoint = <&mdss_dsi0_out>;
74+
};
75+
};
76+
};
77+
};
78+
79+
...

Documentation/devicetree/bindings/display/rockchip/rockchip,rk3588-dw-hdmi-qp.yaml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,14 @@ properties:
113113
description:
114114
Additional HDMI QP related data is accessed through VO GRF regs.
115115

116+
frl-enable-gpios:
117+
description:
118+
Optional GPIO line to be asserted when operating in HDMI 2.1 FRL mode and
119+
deasserted for HDMI 1.4/2.0 TMDS. It can be used to control external
120+
voltage bias for HDMI data lines. When not present the HDMI encoder will
121+
operate in TMDS mode only.
122+
maxItems: 1
123+
116124
required:
117125
- compatible
118126
- reg
@@ -132,8 +140,10 @@ unevaluatedProperties: false
132140
examples:
133141
- |
134142
#include <dt-bindings/clock/rockchip,rk3588-cru.h>
143+
#include <dt-bindings/gpio/gpio.h>
135144
#include <dt-bindings/interrupt-controller/arm-gic.h>
136145
#include <dt-bindings/interrupt-controller/irq.h>
146+
#include <dt-bindings/pinctrl/rockchip.h>
137147
#include <dt-bindings/power/rk3588-power.h>
138148
#include <dt-bindings/reset/rockchip,rk3588-cru.h>
139149
@@ -164,6 +174,7 @@ examples:
164174
rockchip,grf = <&sys_grf>;
165175
rockchip,vo-grf = <&vo1_grf>;
166176
#sound-dai-cells = <0>;
177+
frl-enable-gpios = <&gpio4 RK_PB1 GPIO_ACTIVE_LOW>;
167178
168179
ports {
169180
#address-cells = <1>;

0 commit comments

Comments
 (0)