Skip to content

Commit 683058d

Browse files
committed
Merge tag 'drm-misc-next-2025-04-09' of https://gitlab.freedesktop.org/drm/misc/kernel into drm-next
drm-misc-next for v6.16-rc1: UAPI Changes: - Add ASAHI uapi header! - Add apple fourcc modifiers. - Add capset virtio definitions to UAPI. - Extend EXPORT_SYNC_FILE for timeline syncobjs. Cross-subsystem Changes: - Adjust DMA-BUF sg handling to not cache map on attach. - Update drm/ci, hlcdc, virtio, maintainers. - Update fbdev todo. - Allow setting dma-device for dma-buf import. - Export efi_mem_desc_lookup to make efidrm build as a module. Core Changes: - Update drm scheduler docs. - Use the correct resv object in TTM delayed destroy. - Fix compiler warning with panic qr code, and other small fixes. - drm/ci updates. - Add debugfs file for listing all bridges. - Small fixes to drm/client, ttm tests. - Add documentation to display/hdmi. - Add kunit tests for bridges. - Dont fail managed device probing if connector polling fails. - Create Kconfig.debug for drm core. - Add tests for the drm scheduler. - Add and use new access helpers for DPCPD. - Add generic and optimized conversions for format-helper. - Begin refcounting panel for improving lifetime handling. - Unify simpledrm and ofdrm sysfb, and add extra features. - Split hdmi audio in bridge to make DP audio work. Driver Changes: - Convert drivers to use devm_platform_ioremap_resource(). - Assorted small fixes to imx/legacy-bridg, gma500, pl111, nouveau, vc4, vmwgfx, ast, mxsfb, xlnx, accel/qaic, v3d, bridge/imx8qxp-ldb, ofdrm, bridge/fsl-ldb, udl, bridge/ti-sn65dsi86, bridge/anx7625, cirrus-qemu, bridge/cdns-dsi, panel/sharp, panel/himax, bridge/sil902x, renesas, imagination, various panels. - Allow attaching more display to vkms. - Add Powertip PH128800T004-ZZA01 panel. - Add rotation quirk for ZOTAC panel. - Convert bridge/tc358775 to atomic. - Remove deprecated panel calls from synaptics, novatek, samsung panels. - Refactor shmem helper page pinning and accel drivers using it. - Add dmabuf support to accel/amdxdna. - Use 4k page table format for panfrost/mediatek. - Add common powerup/down dp link helper and use it. - Assorted compiler warning fixes. - Support dma-buf import for renesas Signed-off-by: Dave Airlie <[email protected]> # Conflicts: # include/drm/drm_kunit_helpers.h From: Maarten Lankhorst <[email protected]> Link: https://lore.kernel.org/r/[email protected]
2 parents 8ffd015 + e8bf4a1 commit 683058d

File tree

396 files changed

+14850
-6293
lines changed

Some content is hidden

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

396 files changed

+14850
-6293
lines changed

.clang-format

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -690,6 +690,13 @@ ForEachMacros:
690690
- 'v4l2_m2m_for_each_src_buf'
691691
- 'v4l2_m2m_for_each_src_buf_safe'
692692
- 'virtio_device_for_each_vq'
693+
- 'vkms_config_for_each_connector'
694+
- 'vkms_config_for_each_crtc'
695+
- 'vkms_config_for_each_encoder'
696+
- 'vkms_config_for_each_plane'
697+
- 'vkms_config_connector_for_each_possible_encoder'
698+
- 'vkms_config_encoder_for_each_possible_crtc'
699+
- 'vkms_config_plane_for_each_possible_crtc'
693700
- 'while_for_each_ftrace_op'
694701
- 'xa_for_each'
695702
- 'xa_for_each_marked'

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -246,6 +246,8 @@ properties:
246246
- osddisplays,osd070t1718-19ts
247247
# One Stop Displays OSD101T2045-53TS 10.1" 1920x1200 panel
248248
- osddisplays,osd101t2045-53ts
249+
# POWERTIP PH128800T004-ZZA01 10.1" WXGA TFT LCD panel
250+
- powertip,ph128800t004-zza01
249251
# POWERTIP PH128800T006-ZHC01 10.1" WXGA TFT LCD panel
250252
- powertip,ph128800t006-zhc01
251253
# POWERTIP PH800480T013-IDF2 7.0" WVGA TFT LCD panel

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ properties:
1919
- const: samsung,atna33xc20
2020
- items:
2121
- enum:
22+
# Samsung 14" WQXGA+ (2880×1800 pixels) eDP AMOLED panel
23+
- samsung,atna40yk20
2224
# Samsung 14.5" WQXGA+ (2880x1800 pixels) eDP AMOLED panel
2325
- samsung,atna45af01
2426
# Samsung 14.5" 3K (2944x1840 pixels) eDP AMOLED panel

Documentation/devicetree/bindings/gpu/brcm,bcm-v3d.yaml

Lines changed: 76 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
77
title: Broadcom V3D GPU
88

99
maintainers:
10-
- Eric Anholt <[email protected]>
10+
- Maíra Canal <[email protected]>
1111
- Nicolas Saenz Julienne <[email protected]>
1212

1313
properties:
@@ -22,20 +22,12 @@ properties:
2222
- brcm,7278-v3d
2323

2424
reg:
25-
items:
26-
- description: hub register (required)
27-
- description: core0 register (required)
28-
- description: GCA cache controller register (if GCA controller present)
29-
- description: bridge register (if no external reset controller)
3025
minItems: 2
26+
maxItems: 4
3127

3228
reg-names:
33-
items:
34-
- const: hub
35-
- const: core0
36-
- enum: [ bridge, gca ]
37-
- enum: [ bridge, gca ]
3829
minItems: 2
30+
maxItems: 4
3931

4032
interrupts:
4133
items:
@@ -58,6 +50,76 @@ required:
5850
- reg-names
5951
- interrupts
6052

53+
allOf:
54+
- if:
55+
properties:
56+
compatible:
57+
contains:
58+
const: brcm,2711-v3d
59+
then:
60+
properties:
61+
reg:
62+
items:
63+
- description: hub register
64+
- description: core0 register
65+
reg-names:
66+
items:
67+
- const: hub
68+
- const: core0
69+
- if:
70+
properties:
71+
compatible:
72+
contains:
73+
const: brcm,2712-v3d
74+
then:
75+
properties:
76+
reg:
77+
items:
78+
- description: hub register
79+
- description: core0 register
80+
- description: SMS state manager register
81+
reg-names:
82+
items:
83+
- const: hub
84+
- const: core0
85+
- const: sms
86+
- if:
87+
properties:
88+
compatible:
89+
contains:
90+
const: brcm,7268-v3d
91+
then:
92+
properties:
93+
reg:
94+
items:
95+
- description: hub register
96+
- description: core0 register
97+
- description: GCA cache controller register
98+
- description: bridge register
99+
reg-names:
100+
items:
101+
- const: hub
102+
- const: core0
103+
- const: gca
104+
- const: bridge
105+
- if:
106+
properties:
107+
compatible:
108+
contains:
109+
const: brcm,7278-v3d
110+
then:
111+
properties:
112+
reg:
113+
items:
114+
- description: hub register
115+
- description: core0 register
116+
- description: bridge register
117+
reg-names:
118+
items:
119+
- const: hub
120+
- const: core0
121+
- const: bridge
122+
61123
additionalProperties: false
62124

63125
examples:
@@ -66,9 +128,9 @@ examples:
66128
compatible = "brcm,7268-v3d";
67129
reg = <0xf1200000 0x4000>,
68130
<0xf1208000 0x4000>,
69-
<0xf1204000 0x100>,
70-
<0xf1204100 0x100>;
71-
reg-names = "hub", "core0", "bridge", "gca";
131+
<0xf1204100 0x100>,
132+
<0xf1204000 0x100>;
133+
reg-names = "hub", "core0", "gca", "bridge";
72134
interrupts = <0 78 4>,
73135
<0 77 4>;
74136
};

Documentation/gpu/automated_testing.rst

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,10 @@ created (eg. https://gitlab.freedesktop.org/janedoe/linux/-/pipelines)
115115
5. The various jobs will be run and when the pipeline is finished, all jobs
116116
should be green unless a regression has been found.
117117

118+
6. Warnings in the pipeline indicate that lockdep
119+
(see Documentation/locking/lockdep-design.rst) issues have been detected
120+
during the tests.
121+
118122

119123
How to update test expectations
120124
===============================

Documentation/gpu/driver-uapi.rst

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,3 +27,8 @@ drm/xe uAPI
2727
===========
2828

2929
.. kernel-doc:: include/uapi/drm/xe_drm.h
30+
31+
drm/asahi uAPI
32+
================
33+
34+
.. kernel-doc:: include/uapi/drm/asahi_drm.h

Documentation/gpu/drm-kms-helpers.rst

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -233,6 +233,21 @@ Panel Self Refresh Helper Reference
233233
.. kernel-doc:: drivers/gpu/drm/drm_self_refresh_helper.c
234234
:export:
235235

236+
HDMI Atomic State Helpers
237+
=========================
238+
239+
Overview
240+
--------
241+
242+
.. kernel-doc:: drivers/gpu/drm/display/drm_hdmi_state_helper.c
243+
:doc: hdmi helpers
244+
245+
Functions Reference
246+
-------------------
247+
248+
.. kernel-doc:: drivers/gpu/drm/display/drm_hdmi_state_helper.c
249+
:export:
250+
236251
HDCP Helper Functions Reference
237252
===============================
238253

Documentation/gpu/nouveau.rst

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,3 +27,6 @@ GSP Support
2727

2828
.. kernel-doc:: drivers/gpu/drm/nouveau/nvkm/subdev/gsp/r535.c
2929
:doc: GSP message queue element
30+
31+
.. kernel-doc:: drivers/gpu/drm/nouveau/include/nvkm/subdev/gsp.h
32+
:doc: GSP message handling policy

Documentation/gpu/todo.rst

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -441,14 +441,15 @@ Contact: Thomas Zimmermann <[email protected]>
441441

442442
Level: Intermediate
443443

444-
Request memory regions in all drivers
445-
-------------------------------------
444+
Request memory regions in all fbdev drivers
445+
--------------------------------------------
446446

447-
Go through all drivers and add code to request the memory regions that the
448-
driver uses. This requires adding calls to request_mem_region(),
447+
Old/ancient fbdev drivers do not request their memory properly.
448+
Go through these drivers and add code to request the memory regions
449+
that the driver uses. This requires adding calls to request_mem_region(),
449450
pci_request_region() or similar functions. Use helpers for managed cleanup
450-
where possible.
451-
451+
where possible. Problematic areas include hardware that has exclusive ranges
452+
like VGA. VGA16fb does not request the range as it is expected.
452453
Drivers are pretty bad at doing this and there used to be conflicts among
453454
DRM and fbdev drivers. Still, it's the correct thing to do.
454455

Documentation/gpu/vgaarbiter.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ Section 7, Legacy Devices.
1111

1212
The Resource Access Control (RAC) module inside the X server [0] existed for
1313
the legacy VGA arbitration task (besides other bus management tasks) when more
14-
than one legacy device co-exists on the same machine. But the problem happens
14+
than one legacy device co-exist on the same machine. But the problem happens
1515
when these devices are trying to be accessed by different userspace clients
16-
(e.g. two server in parallel). Their address assignments conflict. Moreover,
16+
(e.g. two servers in parallel). Their address assignments conflict. Moreover,
1717
ideally, being a userspace application, it is not the role of the X server to
1818
control bus resources. Therefore an arbitration scheme outside of the X server
1919
is needed to control the sharing of these resources. This document introduces
@@ -106,7 +106,7 @@ In-kernel interface
106106
libpciaccess
107107
------------
108108

109-
To use the vga arbiter char device it was implemented an API inside the
109+
To use the vga arbiter char device, an API was implemented inside the
110110
libpciaccess library. One field was added to struct pci_device (each device
111111
on the system)::
112112

0 commit comments

Comments
 (0)