Skip to content

Commit 8a07b26

Browse files
committed
Merge tag 'drm-misc-next-2024-10-31' of https://gitlab.freedesktop.org/drm/misc/kernel into drm-next
drm-misc-next for v6.13: All of the previous pull request, with MORE! Core Changes: - Update documentation for scheduler start/stop and job init. - Add dedede and sm8350-hdk hardware to ci runs. Driver Changes: - Small fixes and cleanups to panfrost, omap, nouveau, ivpu, zynqmp, v3d, panthor docs, and leadtek-ltk050h3146w. - Crashdump support for qaic. - Support DP compliance in zynqmp. - Add Samsung S6E88A0-AMS427AP24 panel. Signed-off-by: Dave Airlie <airlied@redhat.com> From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/deeef745-f3fb-4e85-a9d0-e8d38d43c1cf@linux.intel.com
2 parents e7103f8 + 2e07570 commit 8a07b26

File tree

130 files changed

+6428
-984
lines changed

Some content is hidden

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

130 files changed

+6428
-984
lines changed

Documentation/devicetree/bindings/display/bridge/sil,sii9022.yaml

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,9 +81,22 @@ properties:
8181

8282
properties:
8383
port@0:
84-
$ref: /schemas/graph.yaml#/properties/port
84+
unevaluatedProperties: false
85+
$ref: /schemas/graph.yaml#/$defs/port-base
8586
description: Parallel RGB input port
8687

88+
properties:
89+
endpoint:
90+
$ref: /schemas/graph.yaml#/$defs/endpoint-base
91+
unevaluatedProperties: false
92+
93+
properties:
94+
bus-width:
95+
description:
96+
Endpoint bus width.
97+
enum: [ 16, 18, 24 ]
98+
default: 24
99+
87100
port@1:
88101
$ref: /schemas/graph.yaml#/properties/port
89102
description: HDMI output port

Documentation/devicetree/bindings/display/bridge/toshiba,tc358768.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,10 @@ properties:
6060
data-lines:
6161
$ref: /schemas/types.yaml#/definitions/uint32
6262
enum: [ 16, 18, 24 ]
63+
deprecated: true
64+
65+
bus-width:
66+
enum: [ 16, 18, 24 ]
6367

6468
port@1:
6569
$ref: /schemas/graph.yaml#/properties/port

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,14 @@ properties:
5151
$ref: /schemas/types.yaml#/definitions/uint32
5252
enum: [0, 90, 180, 270]
5353

54+
flip-horizontal:
55+
description: boolean to flip image horizontally
56+
type: boolean
57+
58+
flip-vertical:
59+
description: boolean to flip image vertically
60+
type: boolean
61+
5462
# Display Timings
5563
panel-timing:
5664
description:

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -200,6 +200,8 @@ properties:
200200
- logictechno,lttd800480070-l2rt
201201
# Logic Technologies LTTD800480070-L6WH-RT 7” 800x480 TFT Resistive Touch Module
202202
- logictechno,lttd800480070-l6wh-rt
203+
# Microchip AC69T88A 5" 800X480 LVDS interface TFT LCD Panel
204+
- microchip,ac69t88a
203205
# Mitsubishi "AA070MC01 7.0" WVGA TFT LCD panel
204206
- mitsubishi,aa070mc01-ca1
205207
# Mitsubishi AA084XE01 8.4" XGA TFT LCD panel
Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
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,s6e88a0-ams427ap24.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Samsung AMS427AP24 panel with S6E88A0 controller
8+
9+
maintainers:
10+
- Jakob Hauser <jahau@rocketmail.com>
11+
12+
allOf:
13+
- $ref: panel-common.yaml#
14+
15+
properties:
16+
compatible:
17+
const: samsung,s6e88a0-ams427ap24
18+
19+
reg:
20+
maxItems: 1
21+
22+
port: true
23+
reset-gpios: true
24+
flip-horizontal: true
25+
26+
vdd3-supply:
27+
description: core voltage supply
28+
29+
vci-supply:
30+
description: voltage supply for analog circuits
31+
32+
required:
33+
- compatible
34+
- reg
35+
- port
36+
- reset-gpios
37+
- vdd3-supply
38+
- vci-supply
39+
40+
additionalProperties: false
41+
42+
examples:
43+
- |
44+
#include <dt-bindings/gpio/gpio.h>
45+
46+
dsi {
47+
#address-cells = <1>;
48+
#size-cells = <0>;
49+
50+
panel@0 {
51+
compatible = "samsung,s6e88a0-ams427ap24";
52+
reg = <0>;
53+
54+
vdd3-supply = <&pm8916_l17>;
55+
vci-supply = <&pm8916_l6>;
56+
reset-gpios = <&tlmm 25 GPIO_ACTIVE_LOW>;
57+
flip-horizontal;
58+
59+
port {
60+
panel_in: endpoint {
61+
remote-endpoint = <&mdss_dsi0_out>;
62+
};
63+
};
64+
};
65+
};

Documentation/devicetree/bindings/display/panel/samsung,s6e8aa0.yaml

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ properties:
2121

2222
reset-gpios: true
2323
display-timings: true
24+
flip-horizontal: true
25+
flip-vertical: true
2426

2527
vdd3-supply:
2628
description: core voltage supply
@@ -46,14 +48,6 @@ properties:
4648
panel-height-mm:
4749
description: physical panel height [mm]
4850

49-
flip-horizontal:
50-
description: boolean to flip image horizontally
51-
type: boolean
52-
53-
flip-vertical:
54-
description: boolean to flip image vertically
55-
type: boolean
56-
5751
required:
5852
- compatible
5953
- reg
Lines changed: 188 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,188 @@
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,rk3588-dw-hdmi-qp.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Rockchip DW HDMI QP TX Encoder
8+
9+
maintainers:
10+
- Cristian Ciocaltea <cristian.ciocaltea@collabora.com>
11+
12+
description: |
13+
Rockchip RK3588 SoC integrates the Synopsys DesignWare HDMI QP TX controller
14+
IP and a HDMI/eDP TX Combo PHY based on a Samsung IP block, providing the
15+
following features, among others:
16+
17+
* Fixed Rate Link (FRL)
18+
* Display Stream Compression (DSC)
19+
* 4K@120Hz and 8K@60Hz video modes
20+
* Variable Refresh Rate (VRR) including Quick Media Switching (QMS)
21+
* Fast Vactive (FVA)
22+
* SCDC I2C DDC access
23+
* Multi-stream audio
24+
* Enhanced Audio Return Channel (EARC)
25+
26+
allOf:
27+
- $ref: /schemas/sound/dai-common.yaml#
28+
29+
properties:
30+
compatible:
31+
enum:
32+
- rockchip,rk3588-dw-hdmi-qp
33+
34+
reg:
35+
maxItems: 1
36+
37+
clocks:
38+
items:
39+
- description: Peripheral/APB bus clock
40+
- description: EARC RX biphase clock
41+
- description: Reference clock
42+
- description: Audio interface clock
43+
- description: TMDS/FRL link clock
44+
- description: Video datapath clock
45+
46+
clock-names:
47+
items:
48+
- const: pclk
49+
- const: earc
50+
- const: ref
51+
- const: aud
52+
- const: hdp
53+
- const: hclk_vo1
54+
55+
interrupts:
56+
items:
57+
- description: AVP Unit interrupt
58+
- description: CEC interrupt
59+
- description: eARC RX interrupt
60+
- description: Main Unit interrupt
61+
- description: HPD interrupt
62+
63+
interrupt-names:
64+
items:
65+
- const: avp
66+
- const: cec
67+
- const: earc
68+
- const: main
69+
- const: hpd
70+
71+
phys:
72+
maxItems: 1
73+
description: The HDMI/eDP PHY
74+
75+
ports:
76+
$ref: /schemas/graph.yaml#/properties/ports
77+
78+
properties:
79+
port@0:
80+
$ref: /schemas/graph.yaml#/properties/port
81+
description: Video port for RGB/YUV input.
82+
83+
port@1:
84+
$ref: /schemas/graph.yaml#/properties/port
85+
description: Video port for HDMI/eDP output.
86+
87+
required:
88+
- port@0
89+
- port@1
90+
91+
power-domains:
92+
maxItems: 1
93+
94+
resets:
95+
maxItems: 2
96+
97+
reset-names:
98+
items:
99+
- const: ref
100+
- const: hdp
101+
102+
"#sound-dai-cells":
103+
const: 0
104+
105+
rockchip,grf:
106+
$ref: /schemas/types.yaml#/definitions/phandle
107+
description:
108+
Some HDMI QP related data is accessed through SYS GRF regs.
109+
110+
rockchip,vo-grf:
111+
$ref: /schemas/types.yaml#/definitions/phandle
112+
description:
113+
Additional HDMI QP related data is accessed through VO GRF regs.
114+
115+
required:
116+
- compatible
117+
- reg
118+
- clocks
119+
- clock-names
120+
- interrupts
121+
- interrupt-names
122+
- phys
123+
- ports
124+
- resets
125+
- reset-names
126+
- rockchip,grf
127+
- rockchip,vo-grf
128+
129+
unevaluatedProperties: false
130+
131+
examples:
132+
- |
133+
#include <dt-bindings/clock/rockchip,rk3588-cru.h>
134+
#include <dt-bindings/interrupt-controller/arm-gic.h>
135+
#include <dt-bindings/interrupt-controller/irq.h>
136+
#include <dt-bindings/power/rk3588-power.h>
137+
#include <dt-bindings/reset/rockchip,rk3588-cru.h>
138+
139+
soc {
140+
#address-cells = <2>;
141+
#size-cells = <2>;
142+
143+
hdmi@fde80000 {
144+
compatible = "rockchip,rk3588-dw-hdmi-qp";
145+
reg = <0x0 0xfde80000 0x0 0x20000>;
146+
clocks = <&cru PCLK_HDMITX0>,
147+
<&cru CLK_HDMITX0_EARC>,
148+
<&cru CLK_HDMITX0_REF>,
149+
<&cru MCLK_I2S5_8CH_TX>,
150+
<&cru CLK_HDMIHDP0>,
151+
<&cru HCLK_VO1>;
152+
clock-names = "pclk", "earc", "ref", "aud", "hdp", "hclk_vo1";
153+
interrupts = <GIC_SPI 169 IRQ_TYPE_LEVEL_HIGH 0>,
154+
<GIC_SPI 170 IRQ_TYPE_LEVEL_HIGH 0>,
155+
<GIC_SPI 171 IRQ_TYPE_LEVEL_HIGH 0>,
156+
<GIC_SPI 172 IRQ_TYPE_LEVEL_HIGH 0>,
157+
<GIC_SPI 360 IRQ_TYPE_LEVEL_HIGH 0>;
158+
interrupt-names = "avp", "cec", "earc", "main", "hpd";
159+
phys = <&hdptxphy_hdmi0>;
160+
power-domains = <&power RK3588_PD_VO1>;
161+
resets = <&cru SRST_HDMITX0_REF>, <&cru SRST_HDMIHDP0>;
162+
reset-names = "ref", "hdp";
163+
rockchip,grf = <&sys_grf>;
164+
rockchip,vo-grf = <&vo1_grf>;
165+
#sound-dai-cells = <0>;
166+
167+
ports {
168+
#address-cells = <1>;
169+
#size-cells = <0>;
170+
171+
port@0 {
172+
reg = <0>;
173+
174+
hdmi0_in_vp0: endpoint {
175+
remote-endpoint = <&vp0_out_hdmi0>;
176+
};
177+
};
178+
179+
port@1 {
180+
reg = <1>;
181+
182+
hdmi0_out_con0: endpoint {
183+
remote-endpoint = <&hdmi_con0_in>;
184+
};
185+
};
186+
};
187+
};
188+
};

0 commit comments

Comments
 (0)