Skip to content

Commit 0ed1356

Browse files
committed
Merge tag 'drm-misc-next-2025-02-12' of https://gitlab.freedesktop.org/drm/misc/kernel into drm-next
drm-misc-next for v6.15: UAPI Changes: fourcc: - Add modifiers for MediaTek tiled formats Cross-subsystem Changes: bus: - mhi: Enable image transfer via BHIe in PBL dma-buf: - Add fast-path for single-fence merging Core Changes: atomic helper: - Allow full modeset on connector changes - Clarify semantics of allow_modeset - Clarify semantics of drm_atomic_helper_check() buddy allocator: - Fix multi-root cleanup ci: - Update IGT display: - dp: Support Extendeds Wake Timeout - dp_mst: Fix RAD-to-string conversion panic: - Encode QR code according to Fido 2.2 probe helper: - Cleanups scheduler: - Cleanups ttm: - Refactor pool-allocation code - Cleanups Driver Changes: amdxdma: - Fix error handling - Cleanups ast: - Refactor detection of transmitter chips - Refactor support of VBIOS display-mode handling - astdp: Fix connection status; Filter unsupported display modes bridge: - adv7511: Report correct capabilities - it6505: Fix HDCP V compare - sn65dsi86: Fix device IDs - Cleanups i915: - Enable Extendeds Wake Timeout imagination: - Check job dependencies with DRM-sched helper ivpu: - Improve command-queue handling - Use workqueue for IRQ handling - Add suport for HW fault injection - Locking fixes - Cleanups mgag200: - Add support for G200eH5 chips msm: - dpu: Add concurrent writeback support for DPU 10.x+ nouveau: - Move drm_slave_encoder interface into driver - nvkm: Refactor GSP RPC omapdrm: - Cleanups panel: - Convert several panels to multi-style functions to improve error handling - edp: Add support for B140UAN04.4, BOE NV140FHM-NZ, CSW MNB601LS1-3, LG LP079QX1-SP0V, MNE007QS3-7, STA 116QHD024002, Starry 116KHD024006, Lenovo T14s Gen6 Snapdragon - himax-hx83102: Add support for CSOT PNA957QT1-1, Kingdisplay kd110n11-51ie, Starry 2082109qfh040022-50e panthor: - Expose sizes of intenral BOs via fdinfo - Fix race between reset and suspend - Cleanups qaic: - Add support for AIC200 - Cleanups renesas: - Fix limits in DT bindings rockchip: - rk3576: Add HDMI support - vop2: Add new display modes on RK3588 HDMI0 up to 4K - Don't change HDMI reference clock rate - Fix DT bindings solomon: - Set SPI device table to silence warnings - Fix pixel and scanline encoding v3d: - Cleanups vc4: - Use drm_exec - Use dma-resv for wait-BO ioctl - Remove seqno infrastructure virtgpu: - Support partial mappings of GEM objects - Reserve VGA resources during initialization - Fix UAF in virtgpu_dma_buf_free_obj() - Add panic support vkms: - Switch to a managed modesetting pipeline - Add support for ARGB8888 xlnx: - Set correct DMA segment size - Fix error handling - Fix docs Signed-off-by: Dave Airlie <airlied@redhat.com> From: Thomas Zimmermann <tzimmermann@suse.de> Link: https://patchwork.freedesktop.org/patch/msgid/20250212090625.GA24865@linux.fritz.box
2 parents a64dcfb + 50625ea commit 0ed1356

File tree

309 files changed

+7835
-3073
lines changed

Some content is hidden

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

309 files changed

+7835
-3073
lines changed

CREDITS

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3946,6 +3946,10 @@ S: 1 Amherst Street
39463946
S: Cambridge, Massachusetts 02139
39473947
S: USA
39483948

3949+
N: Luben Tuikov
3950+
E: Luben Tuikov <ltuikov89@gmail.com>
3951+
D: Maintainer of the DRM GPU Scheduler
3952+
39493953
N: Simmule Turner
39503954
E: sturner@tele-tv.com
39513955
D: Added swapping to filesystem

Documentation/devicetree/bindings/display/panel/himax,hx83102.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,14 @@ properties:
1818
- enum:
1919
# Boe nv110wum-l60 11.0" WUXGA TFT LCD panel
2020
- boe,nv110wum-l60
21+
# CSOT pna957qt1-1 10.95" WUXGA TFT LCD panel
22+
- csot,pna957qt1-1
2123
# IVO t109nw41 11.0" WUXGA TFT LCD panel
2224
- ivo,t109nw41
25+
# KINGDISPLAY KD110N11-51IE 10.95" WUXGA TFT LCD panel
26+
- kingdisplay,kd110n11-51ie
27+
# STARRY 2082109QFH040022-50E 10.95" WUXGA TFT LCD panel
28+
- starry,2082109qfh040022-50e
2329
# STARRY himax83102-j02 10.51" WUXGA TFT LCD panel
2430
- starry,himax83102-j02
2531
- const: himax,hx83102

Documentation/devicetree/bindings/display/renesas,du.yaml

Lines changed: 31 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,12 +47,26 @@ properties:
4747
maxItems: 1
4848

4949
# See compatible-specific constraints below.
50-
clocks: true
51-
clock-names: true
50+
clocks:
51+
minItems: 1
52+
maxItems: 8
53+
54+
clock-names:
55+
minItems: 1
56+
maxItems: 8
57+
5258
interrupts:
59+
minItems: 1
60+
maxItems: 4
5361
description: Interrupt specifiers, one per DU channel
54-
resets: true
55-
reset-names: true
62+
63+
resets:
64+
minItems: 1
65+
maxItems: 2
66+
67+
reset-names:
68+
minItems: 1
69+
maxItems: 2
5670

5771
power-domains:
5872
maxItems: 1
@@ -74,7 +88,7 @@ properties:
7488

7589
renesas,cmms:
7690
$ref: /schemas/types.yaml#/definitions/phandle-array
77-
minItems: 1
91+
minItems: 2
7892
maxItems: 4
7993
items:
8094
maxItems: 1
@@ -174,6 +188,7 @@ allOf:
174188
- pattern: '^dclkin\.[01]$'
175189

176190
interrupts:
191+
minItems: 2
177192
maxItems: 2
178193

179194
resets:
@@ -229,6 +244,7 @@ allOf:
229244
- pattern: '^dclkin\.[01]$'
230245

231246
interrupts:
247+
minItems: 2
232248
maxItems: 2
233249

234250
resets:
@@ -282,6 +298,7 @@ allOf:
282298
- pattern: '^dclkin\.[01]$'
283299

284300
interrupts:
301+
minItems: 2
285302
maxItems: 2
286303

287304
resets:
@@ -336,6 +353,7 @@ allOf:
336353
- pattern: '^dclkin\.[01]$'
337354

338355
interrupts:
356+
minItems: 2
339357
maxItems: 2
340358

341359
resets:
@@ -397,6 +415,7 @@ allOf:
397415
- pattern: '^dclkin\.[012]$'
398416

399417
interrupts:
418+
minItems: 3
400419
maxItems: 3
401420

402421
resets:
@@ -461,9 +480,11 @@ allOf:
461480
- pattern: '^dclkin\.[0123]$'
462481

463482
interrupts:
483+
minItems: 4
464484
maxItems: 4
465485

466486
resets:
487+
minItems: 2
467488
maxItems: 2
468489

469490
reset-names:
@@ -534,9 +555,11 @@ allOf:
534555
- pattern: '^dclkin\.[012]$'
535556

536557
interrupts:
558+
minItems: 3
537559
maxItems: 3
538560

539561
resets:
562+
minItems: 2
540563
maxItems: 2
541564

542565
reset-names:
@@ -605,9 +628,11 @@ allOf:
605628
- pattern: '^dclkin\.[013]$'
606629

607630
interrupts:
631+
minItems: 3
608632
maxItems: 3
609633

610634
resets:
635+
minItems: 2
611636
maxItems: 2
612637

613638
reset-names:
@@ -726,6 +751,7 @@ allOf:
726751
- pattern: '^dclkin\.[01]$'
727752

728753
interrupts:
754+
minItems: 2
729755
maxItems: 2
730756

731757
resets:

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ allOf:
2929
properties:
3030
compatible:
3131
enum:
32+
- rockchip,rk3576-dw-hdmi-qp
3233
- rockchip,rk3588-dw-hdmi-qp
3334

3435
reg:
@@ -156,7 +157,7 @@ examples:
156157
<GIC_SPI 172 IRQ_TYPE_LEVEL_HIGH 0>,
157158
<GIC_SPI 360 IRQ_TYPE_LEVEL_HIGH 0>;
158159
interrupt-names = "avp", "cec", "earc", "main", "hpd";
159-
phys = <&hdptxphy_hdmi0>;
160+
phys = <&hdptxphy0>;
160161
power-domains = <&power RK3588_PD_VO1>;
161162
resets = <&cru SRST_HDMITX0_REF>, <&cru SRST_HDMIHDP0>;
162163
reset-names = "ref", "hdp";

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,8 @@ properties:
5353
- description: Pixel clock for video port 2.
5454
- description: Pixel clock for video port 3.
5555
- description: Peripheral(vop grf/dsi) clock.
56+
- description: Alternative pixel clock provided by HDMI0 PHY PLL.
57+
- description: Alternative pixel clock provided by HDMI1 PHY PLL.
5658

5759
clock-names:
5860
minItems: 5
@@ -64,6 +66,8 @@ properties:
6466
- const: dclk_vp2
6567
- const: dclk_vp3
6668
- const: pclk_vop
69+
- const: pll_hdmiphy0
70+
- const: pll_hdmiphy1
6771

6872
rockchip,grf:
6973
$ref: /schemas/types.yaml#/definitions/phandle

Documentation/devicetree/bindings/vendor-prefixes.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -338,6 +338,8 @@ patternProperties:
338338
description: Crystalfontz America, Inc.
339339
"^csky,.*":
340340
description: Hangzhou C-SKY Microsystems Co., Ltd
341+
"^csot,.*":
342+
description: Guangzhou China Star Optoelectronics Technology Co., Ltd
341343
"^csq,.*":
342344
description: Shenzen Chuangsiqi Technology Co.,Ltd.
343345
"^ctera,.*":

Documentation/gpu/drivers.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ GPU Driver Documentation
1010
imagination/index
1111
mcde
1212
meson
13+
nouveau
1314
pl111
1415
tegra
1516
tve200

Documentation/gpu/drm-usage-stats.rst

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,10 @@ File format specification
2121

2222
- File shall contain one key value pair per one line of text.
2323
- Colon character (`:`) must be used to delimit keys and values.
24-
- All keys shall be prefixed with `drm-`.
24+
- All standardised keys shall be prefixed with `drm-`.
25+
- Driver-specific keys shall be prefixed with `driver_name-`, where
26+
driver_name should ideally be the same as the `name` field in
27+
`struct drm_driver`, although this is not mandatory.
2528
- Whitespace between the delimiter and first non-whitespace character shall be
2629
ignored when parsing.
2730
- Keys are not allowed to contain whitespace characters.

Documentation/gpu/nouveau.rst

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
.. SPDX-License-Identifier: (GPL-2.0+ OR MIT)
2+
3+
===============================
4+
drm/nouveau NVIDIA GPU Driver
5+
===============================
6+
7+
The drm/nouveau driver provides support for a wide range of NVIDIA GPUs,
8+
covering GeForce, Quadro, and Tesla series, from the NV04 architecture up
9+
to the latest Turing, Ampere, Ada families.
10+
11+
NVKM: NVIDIA Kernel Manager
12+
===========================
13+
14+
The NVKM component serves as the core abstraction layer within the nouveau
15+
driver, responsible for managing NVIDIA GPU hardware at the kernel level.
16+
NVKM provides a unified interface for handling various GPU architectures.
17+
18+
It enables resource management, power control, memory handling, and command
19+
submission required for the proper functioning of NVIDIA GPUs under the
20+
nouveau driver.
21+
22+
NVKM plays a critical role in abstracting hardware complexities and
23+
providing a consistent API to upper layers of the driver stack.
24+
25+
GSP Support
26+
------------------------
27+
28+
.. kernel-doc:: drivers/gpu/drm/nouveau/nvkm/subdev/gsp/r535.c
29+
:doc: GSP message queue element

Documentation/gpu/panthor.rst

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ the currently possible format options:
2626
drm-cycles-panthor: 94439687187
2727
drm-maxfreq-panthor: 1000000000 Hz
2828
drm-curfreq-panthor: 1000000000 Hz
29+
panthor-resident-memory: 10396 KiB
30+
panthor-active-memory: 10396 KiB
2931
drm-total-memory: 16480 KiB
3032
drm-shared-memory: 0
3133
drm-active-memory: 16200 KiB
@@ -44,3 +46,11 @@ driver by writing into the appropriate sysfs node::
4446

4547
Where `N` is a bit mask where cycle and timestamp sampling are respectively
4648
enabled by the first and second bits.
49+
50+
Possible `panthor-*-memory` keys are: `active` and `resident`.
51+
These values convey the sizes of the internal driver-owned shmem BO's that
52+
aren't exposed to user-space through a DRM handle, like queue ring buffers,
53+
sync object arrays and heap chunks. Because they are all allocated and pinned
54+
at creation time, only `panthor-resident-memory` is necessary to tell us their
55+
size. `panthor-active-memory` shows the size of kernel BO's associated with
56+
VM's and groups currently being scheduled for execution by the GPU.

0 commit comments

Comments
 (0)