Skip to content

Commit 48b2728

Browse files
committed
Merge tag 'drm-misc-next-2023-12-14' of git://anongit.freedesktop.org/drm/drm-misc into drm-next
drm-misc-next for $kernel-version: UAPI Changes: Cross-subsystem Changes: - A few fixes for usb/typec Core Changes: - ci: Updates to the defconfig, igt version, etc. - writeback: Move the atomic_check helper from the encoder to connector Driver Changes: - rockchip: Add support for rk3588 - xe: Update the TODO list - panel: - nv3052c: Register documentation, init sequence improvements and support for the Fascontek FS035VG158 - st7701: Add support for the Anbernic RG-ARC - new driver: Synaptics R63353 panel controller, Ilitek ILI9805 panel controller - new panel: AUO G156HAN04.0 Signed-off-by: Dave Airlie <airlied@redhat.com> From: Maxime Ripard <mripard@redhat.com> Link: https://patchwork.freedesktop.org/patch/msgid/aqpn5miejmkks7pbcfex7b6u63uwsruywxsnr3x5ljs45qatin@nbkkej2elk46
2 parents a0a2895 + b1a2aa9 commit 48b2728

Some content is hidden

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

56 files changed

+2568
-386
lines changed
Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
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/fascontek,fs035vg158.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Fascontek FS035VG158 3.5" (640x480 pixels) 24-bit IPS LCD panel
8+
9+
maintainers:
10+
- John Watts <contact@jookia.org>
11+
12+
allOf:
13+
- $ref: panel-common.yaml#
14+
- $ref: /schemas/spi/spi-peripheral-props.yaml#
15+
16+
properties:
17+
compatible:
18+
const: fascontek,fs035vg158
19+
20+
spi-3wire: true
21+
22+
required:
23+
- compatible
24+
- reg
25+
- port
26+
- power-supply
27+
- reset-gpios
28+
29+
unevaluatedProperties: false
30+
31+
examples:
32+
- |
33+
#include <dt-bindings/gpio/gpio.h>
34+
35+
spi {
36+
#address-cells = <1>;
37+
#size-cells = <0>;
38+
panel@0 {
39+
compatible = "fascontek,fs035vg158";
40+
reg = <0>;
41+
42+
spi-3wire;
43+
spi-max-frequency = <3125000>;
44+
45+
reset-gpios = <&gpe 2 GPIO_ACTIVE_LOW>;
46+
47+
backlight = <&backlight>;
48+
power-supply = <&vcc>;
49+
50+
port {
51+
panel_input: endpoint {
52+
remote-endpoint = <&panel_output>;
53+
};
54+
};
55+
};
56+
};
Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
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/ilitek,ili9805.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Ilitek ILI9805 based MIPI-DSI panels
8+
9+
maintainers:
10+
- Michael Trimarchi <michael@amarulasolutions.com>
11+
12+
allOf:
13+
- $ref: panel-common.yaml#
14+
15+
properties:
16+
compatible:
17+
items:
18+
- enum:
19+
- giantplus,gpm1790a0
20+
- tianma,tm041xdhg01
21+
- const: ilitek,ili9805
22+
23+
avdd-supply: true
24+
dvdd-supply: true
25+
reg: true
26+
27+
required:
28+
- compatible
29+
- avdd-supply
30+
- dvdd-supply
31+
- reg
32+
- reset-gpios
33+
- port
34+
- backlight
35+
36+
unevaluatedProperties: false
37+
38+
examples:
39+
- |
40+
#include <dt-bindings/gpio/gpio.h>
41+
42+
dsi {
43+
#address-cells = <1>;
44+
#size-cells = <0>;
45+
46+
panel@0 {
47+
compatible = "giantplus,gpm1790a0", "ilitek,ili9805";
48+
reg = <0>;
49+
avdd-supply = <&avdd_display>;
50+
dvdd-supply = <&dvdd_display>;
51+
reset-gpios = <&r_pio 0 5 GPIO_ACTIVE_LOW>; /* PL05 */
52+
backlight = <&backlight>;
53+
54+
port {
55+
panel_in: endpoint {
56+
remote-endpoint = <&mipi_dsi_out>;
57+
};
58+
};
59+
};
60+
};
61+
62+
...

Documentation/devicetree/bindings/display/panel/leadtek,ltk035c5444t.yaml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,12 @@ properties:
1818
compatible:
1919
const: leadtek,ltk035c5444t
2020

21-
backlight: true
22-
port: true
23-
power-supply: true
24-
reg: true
25-
reset-gpios: true
26-
2721
spi-3wire: true
2822

2923
required:
3024
- compatible
25+
- reg
26+
- port
3127
- power-supply
3228
- reset-gpios
3329

Documentation/devicetree/bindings/display/panel/panel-simple-lvds-dual-ports.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@ properties:
3333

3434
# AU Optronics Corporation 13.3" FHD (1920x1080) TFT LCD panel
3535
- auo,g133han01
36+
# AU Optronics Corporation 15.6" FHD (1920x1080) TFT LCD panel
37+
- auo,g156han04
3638
# AU Optronics Corporation 18.5" FHD (1920x1080) TFT LCD panel
3739
- auo,g185han01
3840
# AU Optronics Corporation 19.0" (1280x1024) TFT LCD panel

Documentation/devicetree/bindings/display/panel/sitronix,st7701.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ properties:
2727
compatible:
2828
items:
2929
- enum:
30+
- anbernic,rg-arc-panel
3031
- densitron,dmt028vghmcmi-1a
3132
- elida,kd50t048a
3233
- techstar,ts8550b

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

Lines changed: 81 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ title: Rockchip SoC display controller (VOP2)
88

99
description:
1010
VOP2 (Video Output Processor v2) is the display controller for the Rockchip
11-
series of SoCs which transfers the image data from a video memory
12-
buffer to an external LCD interface.
11+
series of SoCs which transfers the image data from a video memory buffer to
12+
an external LCD interface.
1313

1414
maintainers:
1515
- Sandy Huang <hjc@rock-chips.com>
@@ -20,15 +20,16 @@ properties:
2020
enum:
2121
- rockchip,rk3566-vop
2222
- rockchip,rk3568-vop
23+
- rockchip,rk3588-vop
2324

2425
reg:
2526
items:
2627
- description:
2728
Must contain one entry corresponding to the base address and length
2829
of the register space.
2930
- description:
30-
Can optionally contain a second entry corresponding to
31-
the CRTC gamma LUT address.
31+
Can optionally contain a second entry corresponding to the CRTC gamma
32+
LUT address.
3233

3334
reg-names:
3435
items:
@@ -41,45 +42,63 @@ properties:
4142
The VOP interrupt is shared by several interrupt sources, such as
4243
frame start (VSYNC), line flag and other status interrupts.
4344

45+
# See compatible-specific constraints below.
4446
clocks:
47+
minItems: 5
4548
items:
46-
- description: Clock for ddr buffer transfer.
47-
- description: Clock for the ahb bus to R/W the phy regs.
49+
- description: Clock for ddr buffer transfer via axi.
50+
- description: Clock for the ahb bus to R/W the regs.
4851
- description: Pixel clock for video port 0.
4952
- description: Pixel clock for video port 1.
5053
- description: Pixel clock for video port 2.
54+
- description: Pixel clock for video port 3.
55+
- description: Peripheral(vop grf/dsi) clock.
5156

5257
clock-names:
58+
minItems: 5
5359
items:
5460
- const: aclk
5561
- const: hclk
5662
- const: dclk_vp0
5763
- const: dclk_vp1
5864
- const: dclk_vp2
65+
- const: dclk_vp3
66+
- const: pclk_vop
5967

6068
rockchip,grf:
6169
$ref: /schemas/types.yaml#/definitions/phandle
6270
description:
63-
Phandle to GRF regs used for misc control
71+
Phandle to GRF regs used for control the polarity of dclk/hsync/vsync of DPI,
72+
also used for query vop memory bisr enable status, etc.
73+
74+
rockchip,vo1-grf:
75+
$ref: /schemas/types.yaml#/definitions/phandle
76+
description:
77+
Phandle to VO GRF regs used for control the polarity of dclk/hsync/vsync of hdmi
78+
on rk3588.
79+
80+
rockchip,vop-grf:
81+
$ref: /schemas/types.yaml#/definitions/phandle
82+
description:
83+
Phandle to VOP GRF regs used for control data path between vopr and hdmi/edp.
84+
85+
rockchip,pmu:
86+
$ref: /schemas/types.yaml#/definitions/phandle
87+
description:
88+
Phandle to PMU GRF used for query vop memory bisr status on rk3588.
6489

6590
ports:
6691
$ref: /schemas/graph.yaml#/properties/ports
6792

68-
properties:
69-
port@0:
93+
patternProperties:
94+
"^port@[0-3]$":
7095
$ref: /schemas/graph.yaml#/properties/port
71-
description:
72-
Output endpoint of VP0
96+
description: Output endpoint of VP0/1/2/3.
7397

74-
port@1:
75-
$ref: /schemas/graph.yaml#/properties/port
76-
description:
77-
Output endpoint of VP1
98+
required:
99+
- port@0
78100

79-
port@2:
80-
$ref: /schemas/graph.yaml#/properties/port
81-
description:
82-
Output endpoint of VP2
101+
unevaluatedProperties: false
83102

84103
iommus:
85104
maxItems: 1
@@ -96,6 +115,49 @@ required:
96115
- clock-names
97116
- ports
98117

118+
allOf:
119+
- if:
120+
properties:
121+
compatible:
122+
contains:
123+
const: rockchip,rk3588-vop
124+
then:
125+
properties:
126+
clocks:
127+
minItems: 7
128+
clock-names:
129+
minItems: 7
130+
131+
ports:
132+
required:
133+
- port@0
134+
- port@1
135+
- port@2
136+
- port@3
137+
138+
required:
139+
- rockchip,grf
140+
- rockchip,vo1-grf
141+
- rockchip,vop-grf
142+
- rockchip,pmu
143+
144+
else:
145+
properties:
146+
rockchip,vo1-grf: false
147+
rockchip,vop-grf: false
148+
rockchip,pmu: false
149+
150+
clocks:
151+
maxItems: 5
152+
clock-names:
153+
maxItems: 5
154+
155+
ports:
156+
required:
157+
- port@0
158+
- port@1
159+
- port@2
160+
99161
additionalProperties: false
100162

101163
examples:

Documentation/devicetree/bindings/vendor-prefixes.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -474,6 +474,8 @@ patternProperties:
474474
description: Fairphone B.V.
475475
"^faraday,.*":
476476
description: Faraday Technology Corporation
477+
"^fascontek,.*":
478+
description: Fascontek
477479
"^fastrax,.*":
478480
description: Fastrax Oy
479481
"^fcs,.*":

Documentation/gpu/automated_testing.rst

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,14 +69,15 @@ the result. They will still be run.
6969

7070
Each new flake entry must be associated with a link to the email reporting the
7171
bug to the author of the affected driver, the board name or Device Tree name of
72-
the board, the first kernel version affected, and an approximation of the
73-
failure rate.
72+
the board, the first kernel version affected, the IGT version used for tests,
73+
and an approximation of the failure rate.
7474

7575
They should be provided under the following format::
7676

7777
# Bug Report: $LORE_OR_PATCHWORK_URL
7878
# Board Name: broken-board.dtb
79-
# Version: 6.6-rc1
79+
# Linux Version: 6.6-rc1
80+
# IGT Version: 1.28-gd2af13d9f
8081
# Failure Rate: 100
8182
flaky-test
8283

0 commit comments

Comments
 (0)