Skip to content

Commit 54bc1d3

Browse files
committed
Merge tag 'drm-misc-next-2024-09-26' of https://gitlab.freedesktop.org/drm/misc/kernel into drm-next
drm-misc-next for v6.13: UAPI Changes: - panthor: Add realtime group priority and priority query. Cross-subsystem Changes: - Add Vivek Kasireddy as udmabuf maintainer. - Assorted udmabuf changes. - Device tree binding updates. - dmabuf documentation fixes. - Move drm_rect to drm core module from kms helper. Core Changes: - Update scheduler documentation and concurrency fixes. - drm/ci updates. - Add memory-agnostic fbdev client and client-agnostic setup helper. - Huge driver conversion for using the above. Driver Changes: - Assorted fixes to imx, panel/nt35510, sti, accel/ivpu, v3d, vkms, host1x. - Add panel quirks for AYA NEO panels. - Make module autoloading work for bridge/it6505 and mcde. - Add huge page support to v3d using a custom shmfs. Signed-off-by: Dave Airlie <[email protected]> From: Maarten Lankhorst <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
2 parents 7fefa1e + 1549974 commit 54bc1d3

File tree

232 files changed

+1950
-1778
lines changed

Some content is hidden

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

232 files changed

+1950
-1778
lines changed

MAINTAINERS

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7460,8 +7460,8 @@ T: git https://gitlab.freedesktop.org/drm/misc/kernel.git
74607460
F: drivers/gpu/drm/udl/
74617461

74627462
DRM DRIVER FOR VIRTUAL KERNEL MODESETTING (VKMS)
7463-
M: Rodrigo Siqueira <[email protected]>
74647463
M: Maíra Canal <[email protected]>
7464+
M: Louis Chauvet <[email protected]>
74657465
R: Haneen Mohammed <[email protected]>
74667466
R: Simona Vetter <[email protected]>
74677467
R: Melissa Wen <[email protected]>
@@ -24205,6 +24205,7 @@ F: lib/iov_iter.c
2420524205

2420624206
USERSPACE DMA BUFFER DRIVER
2420724207
M: Gerd Hoffmann <[email protected]>
24208+
M: Vivek Kasireddy <[email protected]>
2420824209
2420924210
S: Maintained
2421024211
T: git https://gitlab.freedesktop.org/drm/misc/kernel.git

drivers/accel/ivpu/vpu_boot_api.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
/*
1010
* =========== FW API version information beginning ================
11-
* The bellow values will be used to construct the version info this way:
11+
* The below values will be used to construct the version info this way:
1212
* fw_bin_header->api_version[VPU_BOOT_API_VER_ID] = (VPU_BOOT_API_VER_MAJOR << 16) |
1313
* VPU_BOOT_API_VER_MINOR;
1414
* VPU_BOOT_API_VER_PATCH will be ignored. KMD and compatibility is not affected if this changes

drivers/dma-buf/Kconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ config UDMABUF
3636
depends on DMA_SHARED_BUFFER
3737
depends on MEMFD_CREATE || COMPILE_TEST
3838
depends on MMU
39+
select VMAP_PFN
3940
help
4041
A driver to let userspace turn memfd regions into dma-bufs.
4142
Qemu can use this to create host dmabufs for guest framebuffers.

drivers/dma-buf/dma-buf.c

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1296,10 +1296,12 @@ EXPORT_SYMBOL_NS_GPL(dma_buf_move_notify, DMA_BUF);
12961296
* vmap interface is introduced. Note that on very old 32-bit architectures
12971297
* vmalloc space might be limited and result in vmap calls failing.
12981298
*
1299-
* Interfaces::
1299+
* Interfaces:
13001300
*
1301-
* void \*dma_buf_vmap(struct dma_buf \*dmabuf, struct iosys_map \*map)
1302-
* void dma_buf_vunmap(struct dma_buf \*dmabuf, struct iosys_map \*map)
1301+
* .. code-block:: c
1302+
*
1303+
* void *dma_buf_vmap(struct dma_buf *dmabuf, struct iosys_map *map)
1304+
* void dma_buf_vunmap(struct dma_buf *dmabuf, struct iosys_map *map)
13031305
*
13041306
* The vmap call can fail if there is no vmap support in the exporter, or if
13051307
* it runs out of vmalloc space. Note that the dma-buf layer keeps a reference
@@ -1356,10 +1358,11 @@ EXPORT_SYMBOL_NS_GPL(dma_buf_move_notify, DMA_BUF);
13561358
* enough, since adding interfaces to intercept pagefaults and allow pte
13571359
* shootdowns would increase the complexity quite a bit.
13581360
*
1359-
* Interface::
1361+
* Interface:
1362+
*
1363+
* .. code-block:: c
13601364
*
1361-
* int dma_buf_mmap(struct dma_buf \*, struct vm_area_struct \*,
1362-
* unsigned long);
1365+
* int dma_buf_mmap(struct dma_buf *, struct vm_area_struct *, unsigned long);
13631366
*
13641367
* If the importing subsystem simply provides a special-purpose mmap call to
13651368
* set up a mapping in userspace, calling do_mmap with &dma_buf.file will

0 commit comments

Comments
 (0)