Skip to content

Commit 135130d

Browse files
committed
Merge tag 'drm-misc-next-2025-04-29' of https://gitlab.freedesktop.org/drm/misc/kernel into drm-next
drm-misc-next for v6.16-rc1: UAPI Changes: - panthor now fails in mmap_offset call for a BO created with DRM_PANTHOR_BO_NO_MMAP. - Add DRM_PANTHOR_BO_SET_LABEL ioctl and label panthor kernel BOs. Cross-subsystem Changes: - Add kmap_local_page_try_from_panic for drm/panic. - Add DT bindings for panels. - Update DT bindings for imagination. - Extend %p4cc in lib/vsprintf.c to support fourcc printing. Core Changes: - Remove the disgusting turds. - Register definition updates for DP. - DisplayID timing blocks refactor. - Remove now unused mipi_dsi_dsc_write_seq. - Convert panel drivers to not return error in prepare/enable and unprepare/disable calls. Driver Changes: - Assorted small fixes and featuers for rockchip, panthor, accel/ivpu, accel/amdxdna, hisilicon/hibmc, i915/backlight, sysfb, accel/qaic, udl, etnaviv, virtio, xlnx, panel/boe-bf060y8m-aj0, bridge/synopsis, panthor, panel/samsung/sofef00m, lontium/lt9611uxc, nouveau, panel/himax-hx8279, panfrost, st7571-i2c. - Improve hibmc interrupt handling and add HPD support. - Add NLT NL13676BC25-03F, Tianma TM070JDHG34-00, Himax HX8279/HX8279-D DDIC, Visionox G2647FB105, Sitronix ST7571 LCD Controller, panels. - Add zpos, alpha and blend to renesas. - Convert drivers to use drm_gem_is_imported, replacing gem->import_attach. - Support TI AM68 GPU in imagination. - Support panic handler in virtio. - Add support to get the panel from DP AUX bus in rockchip and add RK3588 support. - Make sofef00 only support the sofef00 panel, not another unrelated one. - Add debugfs BO dumping support to panthor, and print associated labels. - Implement heartbeat based hangcheck in ivpu. - Mass convert drivers to devm_drm_bridge_alloc api. Signed-off-by: Dave Airlie <[email protected]> From: Maarten Lankhorst <[email protected]> Link: https://lore.kernel.org/r/[email protected]
2 parents 9924db4 + f2c8f90 commit 135130d

File tree

157 files changed

+6556
-1423
lines changed

Some content is hidden

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

157 files changed

+6556
-1423
lines changed

Documentation/core-api/printk-formats.rst

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -648,6 +648,38 @@ Examples::
648648
%p4cc Y10 little-endian (0x20303159)
649649
%p4cc NV12 big-endian (0xb231564e)
650650

651+
Generic FourCC code
652+
-------------------
653+
654+
::
655+
%p4c[hnlb] gP00 (0x67503030)
656+
657+
Print a generic FourCC code, as both ASCII characters and its numerical
658+
value as hexadecimal.
659+
660+
The generic FourCC code is always printed in the big-endian format,
661+
the most significant byte first. This is the opposite of V4L/DRM FourCCs.
662+
663+
The additional ``h``, ``n``, ``l``, and ``b`` specifiers define what
664+
endianness is used to load the stored bytes. The data might be interpreted
665+
using the host byte order, network byte order, little-endian, or big-endian.
666+
667+
Passed by reference.
668+
669+
Examples for a little-endian machine, given &(u32)0x67503030::
670+
671+
%p4ch gP00 (0x67503030)
672+
%p4cn 00Pg (0x30305067)
673+
%p4cl gP00 (0x67503030)
674+
%p4cb 00Pg (0x30305067)
675+
676+
Examples for a big-endian machine, given &(u32)0x67503030::
677+
678+
%p4ch gP00 (0x67503030)
679+
%p4cn 00Pg (0x30305067)
680+
%p4cl 00Pg (0x30305067)
681+
%p4cb gP00 (0x67503030)
682+
651683
Rust
652684
----
653685

Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
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/himax,hx8279.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Himax HX8279/HX8279-D based MIPI-DSI panels
8+
9+
maintainers:
10+
- AngeloGioacchino Del Regno <[email protected]>
11+
12+
description:
13+
The Himax HX8279 is a 1803 channel outputs source driver with MIPI
14+
TCON, which generates the horizontal and vertical control timing to
15+
the source and gate drivers.
16+
This DriverIC is most suitable for 1200x1920, 1080x1920, 1200x1600,
17+
and 600x1024 panels and outputs full RGB888 over two or four lanes,
18+
single or dual, MIPI-DSI video interface.
19+
20+
allOf:
21+
- $ref: panel-common-dual.yaml#
22+
23+
properties:
24+
compatible:
25+
items:
26+
- enum:
27+
- aoly,sl101pm1794fog-v15
28+
- startek,kd070fhfid078
29+
- const: himax,hx8279
30+
31+
reg:
32+
maxItems: 1
33+
34+
iovcc-supply:
35+
description: I/O voltage supply
36+
37+
vdd-supply:
38+
description: Panel power supply
39+
40+
required:
41+
- compatible
42+
- reg
43+
- backlight
44+
- reset-gpios
45+
- iovcc-supply
46+
- vdd-supply
47+
48+
unevaluatedProperties: false
49+
50+
examples:
51+
- |
52+
#include <dt-bindings/gpio/gpio.h>
53+
54+
dsi {
55+
#address-cells = <1>;
56+
#size-cells = <0>;
57+
58+
panel@0 {
59+
compatible = "startek,kd070fhfid078", "himax,hx8279";
60+
reg = <0>;
61+
backlight = <&backlight>;
62+
enable-gpios = <&pio 25 GPIO_ACTIVE_HIGH>;
63+
reset-gpios = <&pio 45 GPIO_ACTIVE_HIGH>;
64+
iovcc-supply = <&vreg_lcm_vio>;
65+
vdd-supply = <&vreg_lcm_vdd>;
66+
67+
port {
68+
panel_in: endpoint {
69+
remote-endpoint = <&dsi_out>;
70+
};
71+
};
72+
};
73+
};
74+
75+
...

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -226,6 +226,8 @@ properties:
226226
- netron-dy,e231732
227227
# Newhaven Display International 480 x 272 TFT LCD panel
228228
- newhaven,nhd-4.3-480272ef-atxl
229+
# NLT Technologies, Ltd. 15.6" WXGA (1366×768) LVDS TFT LCD panel
230+
- nlt,nl13676bc25-03f
229231
# New Vision Display 7.0" 800 RGB x 480 TFT LCD panel
230232
- nvd,9128
231233
# OKAYA Electric America, Inc. RS800480T-7X0GP 7" WVGA LCD panel
@@ -286,6 +288,8 @@ properties:
286288
- startek,kd070wvfpa
287289
# Team Source Display Technology TST043015CMHX 4.3" WQVGA TFT LCD panel
288290
- team-source-display,tst043015cmhx
291+
# Tianma Micro-electronics P0700WXF1MBAA 7.0" WXGA (1280x800) LVDS TFT LCD panel
292+
- tianma,p0700wxf1mbaa
289293
# Tianma Micro-electronics TM070JDHG30 7.0" WXGA TFT LCD panel
290294
- tianma,tm070jdhg30
291295
# Tianma Micro-electronics TM070JDHG34-00 7.0" WXGA (1280x800) LVDS TFT LCD panel
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/visionox,g2647fb105.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Visionox G2647FB105 6.47" 1080x2340 MIPI-DSI Panel
8+
9+
maintainers:
10+
- Alexander Baransky <[email protected]>
11+
12+
description:
13+
The Visionox G2647FB105 is a 6.47 inch 1080x2340 MIPI-DSI CMD mode OLED panel.
14+
15+
allOf:
16+
- $ref: panel-common.yaml#
17+
18+
properties:
19+
compatible:
20+
const: visionox,g2647fb105
21+
22+
reg:
23+
maxItems: 1
24+
25+
vdd3p3-supply:
26+
description: 3.3V source voltage rail
27+
28+
vddio-supply:
29+
description: I/O source voltage rail
30+
31+
vsn-supply:
32+
description: Negative source voltage rail
33+
34+
vsp-supply:
35+
description: Positive source voltage rail
36+
37+
reset-gpios: true
38+
port: true
39+
40+
required:
41+
- compatible
42+
- reg
43+
- vdd3p3-supply
44+
- vddio-supply
45+
- vsn-supply
46+
- vsp-supply
47+
- reset-gpios
48+
- port
49+
50+
additionalProperties: false
51+
52+
examples:
53+
- |
54+
#include <dt-bindings/gpio/gpio.h>
55+
56+
dsi {
57+
#address-cells = <1>;
58+
#size-cells = <0>;
59+
60+
panel@0 {
61+
compatible = "visionox,g2647fb105";
62+
reg = <0>;
63+
64+
vdd3p3-supply = <&vreg_l7c_3p0>;
65+
vddio-supply = <&vreg_l13a_1p8>;
66+
vsn-supply = <&vreg_ibb>;
67+
vsp-supply = <&vreg_lab>;
68+
69+
reset-gpios = <&pm6150l_gpios 9 GPIO_ACTIVE_LOW>;
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,analogix-dp.yaml

Lines changed: 23 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ properties:
1515
enum:
1616
- rockchip,rk3288-dp
1717
- rockchip,rk3399-edp
18+
- rockchip,rk3588-edp
1819

1920
clocks:
2021
minItems: 2
@@ -31,16 +32,23 @@ properties:
3132
maxItems: 1
3233

3334
resets:
34-
maxItems: 1
35+
minItems: 1
36+
maxItems: 2
3537

3638
reset-names:
37-
const: dp
39+
minItems: 1
40+
items:
41+
- const: dp
42+
- const: apb
3843

3944
rockchip,grf:
4045
$ref: /schemas/types.yaml#/definitions/phandle
4146
description:
4247
This SoC makes use of GRF regs.
4348

49+
aux-bus:
50+
$ref: /schemas/display/dp-aux-bus.yaml#
51+
4452
required:
4553
- compatible
4654
- clocks
@@ -52,6 +60,19 @@ required:
5260
allOf:
5361
- $ref: /schemas/display/bridge/analogix,dp.yaml#
5462

63+
- if:
64+
properties:
65+
compatible:
66+
contains:
67+
enum:
68+
- rockchip,rk3588-edp
69+
then:
70+
properties:
71+
resets:
72+
minItems: 2
73+
reset-names:
74+
minItems: 2
75+
5576
unevaluatedProperties: false
5677

5778
examples:

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -73,12 +73,6 @@ properties:
7373
port:
7474
$ref: /schemas/graph.yaml#/properties/port
7575

76-
assigned-clocks:
77-
maxItems: 2
78-
79-
assigned-clock-rates:
80-
maxItems: 2
81-
8276
iommus:
8377
maxItems: 1
8478

Lines changed: 73 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,73 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/display/sitronix,st7571.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Sitronix ST7571 Display Controller
8+
9+
maintainers:
10+
- Marcus Folkesson <[email protected]>
11+
12+
description:
13+
Sitronix ST7571 is a driver and controller for 4-level gray
14+
scale and monochrome dot matrix LCD panels.
15+
16+
allOf:
17+
- $ref: panel/panel-common.yaml#
18+
19+
properties:
20+
compatible:
21+
const: sitronix,st7571
22+
23+
reg:
24+
maxItems: 1
25+
26+
sitronix,grayscale:
27+
type: boolean
28+
description:
29+
Display supports 4-level grayscale.
30+
31+
reset-gpios: true
32+
width-mm: true
33+
height-mm: true
34+
panel-timing: true
35+
36+
required:
37+
- compatible
38+
- reg
39+
- reset-gpios
40+
- width-mm
41+
- height-mm
42+
- panel-timing
43+
44+
additionalProperties: false
45+
46+
examples:
47+
- |
48+
#include <dt-bindings/gpio/gpio.h>
49+
50+
i2c {
51+
#address-cells = <1>;
52+
#size-cells = <0>;
53+
54+
display@3f {
55+
compatible = "sitronix,st7571";
56+
reg = <0x3f>;
57+
reset-gpios = <&gpio0 3 GPIO_ACTIVE_LOW>;
58+
width-mm = <37>;
59+
height-mm = <27>;
60+
61+
panel-timing {
62+
hactive = <128>;
63+
vactive = <96>;
64+
hback-porch = <0>;
65+
vback-porch = <0>;
66+
clock-frequency = <0>;
67+
hfront-porch = <0>;
68+
hsync-len = <0>;
69+
vfront-porch = <0>;
70+
vsync-len = <0>;
71+
};
72+
};
73+
};

0 commit comments

Comments
 (0)