Skip to content

Commit d4dc08c

Browse files
author
Danilo Krummrich
committed
Merge drm-misc-next-2025-08-21 into drm-rust-next
We need the DRM Rust changes that went into drm-misc before the existence of the drm-rust tree in here as well. Signed-off-by: Danilo Krummrich <dakr@kernel.org>
2 parents 6b35936 + 043d9c6 commit d4dc08c

349 files changed

Lines changed: 12930 additions & 2847 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.

‎.mailmap‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,8 @@ Casey Connolly <casey.connolly@linaro.org> <caleb@connolly.tech>
164164
Casey Connolly <casey.connolly@linaro.org> <caleb@postmarketos.org>
165165
Can Guo <quic_cang@quicinc.com> <cang@codeaurora.org>
166166
Carl Huang <quic_cjhuang@quicinc.com> <cjhuang@codeaurora.org>
167+
Carl Vanderlip <carl.vanderlip@oss.qualcomm.com> <carlv@codeaurora.org>
168+
Carl Vanderlip <carl.vanderlip@oss.qualcomm.com> <quic_carlv@quicinc.com>
167169
Carlos Bilbao <carlos.bilbao@kernel.org> <carlos.bilbao@amd.com>
168170
Carlos Bilbao <carlos.bilbao@kernel.org> <carlos.bilbao.osdev@gmail.com>
169171
Carlos Bilbao <carlos.bilbao@kernel.org> <bilbao@vt.edu>

‎Documentation/ABI/stable/sysfs-block‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -731,7 +731,7 @@ Contact: linux-block@vger.kernel.org
731731
Description:
732732
[RW] If the device is registered for writeback throttling, then
733733
this file shows the target minimum read latency. If this latency
734-
is exceeded in a given window of time (see wb_window_usec), then
734+
is exceeded in a given window of time (see curr_win_nsec), then
735735
the writeback throttling will start scaling back writes. Writing
736736
a value of '0' to this file disables the feature. Writing a
737737
value of '-1' to this file resets the value to the default

‎Documentation/accel/index.rst‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ Compute Accelerators
1010
introduction
1111
amdxdna/index
1212
qaic/index
13+
rocket/index
1314

1415
.. only:: subproject and html
1516

‎Documentation/accel/rocket/index.rst‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
.. SPDX-License-Identifier: GPL-2.0-only
2+
3+
=====================================
4+
accel/rocket Rockchip NPU driver
5+
=====================================
6+
7+
The accel/rocket driver supports the Neural Processing Units (NPUs) inside some
8+
Rockchip SoCs such as the RK3588. Rockchip calls it RKNN and sometimes RKNPU.
9+
10+
The hardware is described in chapter 36 in the RK3588 TRM.
11+
12+
This driver just powers the hardware on and off, allocates and maps buffers to
13+
the device and submits jobs to the frontend unit. Everything else is done in
14+
userspace, as a Gallium driver (also called rocket) that is part of the Mesa3D
15+
project.
16+
17+
Hardware currently supported:
18+
19+
* RK3588

‎Documentation/admin-guide/blockdev/zoned_loop.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ zone_capacity_mb Device zone capacity (must always be equal to or lower than
7979
the zone size. Default: zone size.
8080
conv_zones Total number of conventioanl zones starting from sector 0.
8181
Default: 8.
82-
base_dir Path to the base directoy where to create the directory
82+
base_dir Path to the base directory where to create the directory
8383
containing the zone files of the device.
8484
Default=/var/local/zloop.
8585
The device directory containing the zone files is always

‎Documentation/admin-guide/hw-vuln/attack_vector_controls.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ Spectre_v1 X
214214
Spectre_v2 X X
215215
Spectre_v2_user X X * (Note 1)
216216
SRBDS X X X X
217-
SRSO X X
217+
SRSO X X X X
218218
SSB (Note 4)
219219
TAA X X X X * (Note 2)
220220
TSA X X X X

‎Documentation/devicetree/bindings/display/bridge/solomon,ssd2825.yaml‎

Lines changed: 141 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,141 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/display/bridge/solomon,ssd2825.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Solomon SSD2825 RGB to MIPI-DSI bridge
8+
9+
maintainers:
10+
- Svyatoslav Ryhel <clamor95@gmail.com>
11+
12+
allOf:
13+
- $ref: /schemas/spi/spi-peripheral-props.yaml#
14+
15+
properties:
16+
compatible:
17+
const: solomon,ssd2825
18+
19+
reg:
20+
maxItems: 1
21+
22+
reset-gpios: true
23+
24+
dvdd-supply:
25+
description: Regulator for 1.2V digital power supply.
26+
27+
avdd-supply:
28+
description: Regulator for 1.2V analog power supply.
29+
30+
vddio-supply:
31+
description: Regulator for 1.8V IO power supply.
32+
33+
spi-max-frequency:
34+
maximum: 1000000
35+
36+
spi-cpha: true
37+
spi-cpol: true
38+
39+
clocks:
40+
maxItems: 1
41+
description: Reference TX_CLK used before PLL is locked.
42+
43+
solomon,hs-zero-delay-ns:
44+
description:
45+
HS zero delay period
46+
minimum: 0
47+
maximum: 1700
48+
default: 133
49+
50+
solomon,hs-prep-delay-ns:
51+
description:
52+
HS prep delay period
53+
minimum: 0
54+
maximum: 1728
55+
default: 40
56+
57+
ports:
58+
$ref: /schemas/graph.yaml#/properties/ports
59+
60+
properties:
61+
port@0:
62+
$ref: /schemas/graph.yaml#/$defs/port-base
63+
unevaluatedProperties: false
64+
description:
65+
Video port for RGB input
66+
67+
properties:
68+
endpoint:
69+
$ref: /schemas/graph.yaml#/$defs/endpoint-base
70+
unevaluatedProperties: false
71+
72+
properties:
73+
bus-width:
74+
enum: [ 16, 18, 24 ]
75+
76+
port@1:
77+
$ref: /schemas/graph.yaml#/properties/port
78+
description:
79+
Video port for DSI output (panel or connector)
80+
81+
required:
82+
- port@0
83+
- port@1
84+
85+
required:
86+
- compatible
87+
- ports
88+
89+
additionalProperties: false
90+
91+
examples:
92+
- |
93+
#include <dt-bindings/gpio/gpio.h>
94+
95+
spi {
96+
#address-cells = <1>;
97+
#size-cells = <0>;
98+
99+
dsi@2 {
100+
compatible = "solomon,ssd2825";
101+
reg = <2>;
102+
103+
spi-max-frequency = <1000000>;
104+
105+
spi-cpha;
106+
spi-cpol;
107+
108+
reset-gpios = <&gpio 114 GPIO_ACTIVE_LOW>;
109+
110+
dvdd-supply = <&vdd_1v2>;
111+
avdd-supply = <&vdd_1v2>;
112+
vddio-supply = <&vdd_1v8_io>;
113+
114+
solomon,hs-zero-delay-ns = <300>;
115+
solomon,hs-prep-delay-ns = <65>;
116+
117+
clocks = <&ssd2825_tx_clk>;
118+
119+
ports {
120+
#address-cells = <1>;
121+
#size-cells = <0>;
122+
123+
port@0 {
124+
reg = <0>;
125+
126+
bridge_input: endpoint {
127+
remote-endpoint = <&dpi_output>;
128+
bus-width = <24>;
129+
};
130+
};
131+
132+
port@1 {
133+
reg = <1>;
134+
135+
bridge_output: endpoint {
136+
remote-endpoint = <&panel_input>;
137+
};
138+
};
139+
};
140+
};
141+
};

‎Documentation/devicetree/bindings/display/bridge/waveshare,dsi2dpi.yaml‎

Lines changed: 103 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,103 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/display/bridge/waveshare,dsi2dpi.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Waveshare MIPI-DSI to DPI Converter bridge
8+
9+
maintainers:
10+
- Joseph Guo <qijian.guo@nxp.com>
11+
12+
description:
13+
Waveshare bridge board is part of Waveshare panel which converts DSI to DPI.
14+
15+
properties:
16+
compatible:
17+
const: waveshare,dsi2dpi
18+
19+
reg:
20+
maxItems: 1
21+
description: base I2C address of the device
22+
23+
power-supply: true
24+
25+
ports:
26+
$ref: /schemas/graph.yaml#/properties/ports
27+
28+
properties:
29+
port@0:
30+
$ref: /schemas/graph.yaml#/$defs/port-base
31+
unevaluatedProperties: false
32+
description:
33+
Video port for MIPI DSI input
34+
35+
properties:
36+
endpoint:
37+
$ref: /schemas/media/video-interfaces.yaml#
38+
unevaluatedProperties: false
39+
40+
properties:
41+
data-lanes:
42+
description: array of physical DSI data lane indexes.
43+
items:
44+
- const: 1
45+
- const: 2
46+
47+
required:
48+
- data-lanes
49+
50+
port@1:
51+
$ref: /schemas/graph.yaml#/properties/port
52+
description:
53+
Video port for MIPI DPI output panel.
54+
55+
required:
56+
- port@0
57+
- port@1
58+
59+
required:
60+
- compatible
61+
- reg
62+
- ports
63+
- power-supply
64+
65+
additionalProperties: false
66+
67+
examples:
68+
- |
69+
70+
i2c {
71+
#address-cells = <1>;
72+
#size-cells = <0>;
73+
74+
bridge@45 {
75+
compatible = "waveshare,dsi2dpi";
76+
reg = <0x45>;
77+
power-supply = <&reg_3p3v>;
78+
79+
ports {
80+
#address-cells = <1>;
81+
#size-cells = <0>;
82+
83+
port@0 {
84+
reg = <0>;
85+
86+
waveshare_from_dsim: endpoint {
87+
data-lanes = <1 2>;
88+
remote-endpoint = <&dsim_to_waveshare>;
89+
};
90+
};
91+
92+
port@1 {
93+
reg = <1>;
94+
95+
waveshare_to_panel: endpoint {
96+
remote-endpoint = <&panel_to_waveshare>;
97+
};
98+
};
99+
};
100+
};
101+
};
102+
103+
...

‎Documentation/devicetree/bindings/display/panel/hydis,hv101hd1.yaml‎

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/hydis,hv101hd1.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Hydis HV101HD1 DSI Display Panel
8+
9+
maintainers:
10+
- Svyatoslav Ryhel <clamor95@gmail.com>
11+
12+
allOf:
13+
- $ref: panel-common.yaml#
14+
15+
properties:
16+
compatible:
17+
const: hydis,hv101hd1
18+
19+
reg:
20+
maxItems: 1
21+
22+
vdd-supply: true
23+
vio-supply: true
24+
25+
backlight: true
26+
port: true
27+
28+
required:
29+
- compatible
30+
- vdd-supply
31+
- vio-supply
32+
- backlight
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 = "hydis,hv101hd1";
46+
reg = <0>;
47+
48+
vdd-supply = <&vdd_lcd>;
49+
vio-supply = <&vddio_lcd>;
50+
51+
backlight = <&backlight>;
52+
53+
port {
54+
panel_in: endpoint {
55+
remote-endpoint = <&dsi_out>;
56+
};
57+
};
58+
};
59+
};
60+
...

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -236,6 +236,8 @@ properties:
236236
- okaya,rs800480t-7x0gp
237237
# Olimex 4.3" TFT LCD panel
238238
- olimex,lcd-olinuxino-43-ts
239+
# Olimex 5.0" TFT LCD panel
240+
- olimex,lcd-olinuxino-5-cts
239241
# On Tat Industrial Company 5" DPI TFT panel.
240242
- ontat,kd50g21-40nt-a1
241243
# On Tat Industrial Company 7" DPI TFT panel.
@@ -321,6 +323,10 @@ properties:
321323
- vivax,tpc9150-panel
322324
# VXT 800x480 color TFT LCD panel
323325
- vxt,vl050-8048nt-c01
326+
# Waveshare 13.3" FHD (1920x1080) LCD panel
327+
- waveshare,13.3inch-panel
328+
# Waveshare 7.0" WSVGA (1024x600) LCD panel
329+
- waveshare,7.0inch-c-panel
324330
# Winstar Display Corporation 3.5" QVGA (320x240) TFT LCD panel
325331
- winstar,wf35ltiacd
326332
# Yes Optoelectronics YTC700TLAG-05-201C 7" TFT LCD panel

0 commit comments

Comments
 (0)