Skip to content

Commit b2c6627

Browse files
committed
Merge tag 'drm-misc-next-2026-01-22' of https://gitlab.freedesktop.org/drm/misc/kernel into drm-next
drm-misc-next for 6.20: Core Changes: - buddy: Fix free_trees memory leak, prevent a BUG_ON - dma-buf: Start to introduce cgroup memory accounting in heaps, Remove sysfs stats, add new tracepoints - hdmi: Limit infoframes exposure to userspace based on driver capabilities - property: Account for property blobs in memcg Driver Changes: - atmel-hlcdc: Switch to drmm resources, Support nomodeset parameter, various patches to use newish helpers and fix memory safety bugs - hisilicon: Fix various DisplayPort related bugs - imagination: Introduce hardware version checks - renesas: Fix kernel panic on reboot - rockchip: Fix RK3576 HPD interrupt handling, Improve RK3588 HPD interrupt handling - v3d: Convert to drm logging helpers - bridge: - Continuation of the refcounting effort - new bridge: Algoltek AG6311 - panel: - new panel: Anbernic RG-DS Signed-off-by: Dave Airlie <airlied@redhat.com> From: Maxime Ripard <mripard@redhat.com> Link: https://patch.msgid.link/20260122-antique-sexy-junglefowl-1bc5a8@houat
2 parents d2f618b + 68b271a commit b2c6627

94 files changed

Lines changed: 3101 additions & 1482 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: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -373,7 +373,9 @@ Jesper Dangaard Brouer <hawk@kernel.org> <hawk@comx.dk>
373373
Jesper Dangaard Brouer <hawk@kernel.org> <jbrouer@redhat.com>
374374
Jesper Dangaard Brouer <hawk@kernel.org> <jdb@comx.dk>
375375
Jesper Dangaard Brouer <hawk@kernel.org> <netoptimizer@brouer.com>
376-
Jessica Zhang <quic_jesszhan@quicinc.com> <jesszhan@codeaurora.org>
376+
Jessica Zhang <jesszhan0024@gmail.com> <jesszhan@codeaurora.org>
377+
Jessica Zhang <jesszhan0024@gmail.com> <quic_jesszhan@quicinc.com>
378+
Jessica Zhang <jesszhan0024@gmail.com> <jessica.zhang@oss.qualcomm.com>
377379
Jilai Wang <quic_jilaiw@quicinc.com> <jilaiw@codeaurora.org>
378380
Jiri Kosina <jikos@kernel.org> <jikos@jikos.cz>
379381
Jiri Kosina <jikos@kernel.org> <jkosina@suse.cz>

Documentation/ABI/testing/sysfs-kernel-dmabuf-buffers

Lines changed: 0 additions & 24 deletions
This file was deleted.

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ properties:
2727
- const: adi,adv7123
2828
- enum:
2929
- adi,adv7123
30+
- algoltek,ag6311
3031
- asl-tek,cs5263
3132
- dumb-vga-dac
3233
- parade,ps185hdm

Documentation/devicetree/bindings/display/panel/jadard,jd9365da-h3.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ properties:
1616
compatible:
1717
items:
1818
- enum:
19+
- anbernic,rg-ds-display-bottom
20+
- anbernic,rg-ds-display-top
1921
- chongzhou,cz101b4001
2022
- kingdisplay,kd101ne3-40ti
2123
- melfas,lmfbx101117480

Documentation/devicetree/bindings/vendor-prefixes.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,8 @@ patternProperties:
8686
description: Aldec, Inc.
8787
"^alfa-network,.*":
8888
description: ALFA Network Inc.
89+
"^algoltek,.*":
90+
description: AlgolTek, Inc.
8991
"^allegro,.*":
9092
description: Allegro DVT
9193
"^allegromicro,.*":

Documentation/driver-api/dma-buf.rst

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -125,11 +125,6 @@ Implicit Fence Poll Support
125125
.. kernel-doc:: drivers/dma-buf/dma-buf.c
126126
:doc: implicit fence polling
127127

128-
DMA-BUF statistics
129-
~~~~~~~~~~~~~~~~~~
130-
.. kernel-doc:: drivers/dma-buf/dma-buf-sysfs-stats.c
131-
:doc: overview
132-
133128
DMA Buffer ioctls
134129
~~~~~~~~~~~~~~~~~
135130

drivers/dma-buf/Kconfig

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -75,21 +75,6 @@ menuconfig DMABUF_HEAPS
7575
allows userspace to allocate dma-bufs that can be shared
7676
between drivers.
7777

78-
menuconfig DMABUF_SYSFS_STATS
79-
bool "DMA-BUF sysfs statistics (DEPRECATED)"
80-
depends on DMA_SHARED_BUFFER
81-
help
82-
Choose this option to enable DMA-BUF sysfs statistics
83-
in location /sys/kernel/dmabuf/buffers.
84-
85-
/sys/kernel/dmabuf/buffers/<inode_number> will contain
86-
statistics for the DMA-BUF with the unique inode number
87-
<inode_number>.
88-
89-
This option is deprecated and should sooner or later be removed.
90-
Android is the only user of this and it turned out that this resulted
91-
in quite some performance problems.
92-
9378
source "drivers/dma-buf/heaps/Kconfig"
9479

9580
endmenu

drivers/dma-buf/Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ obj-$(CONFIG_DMABUF_HEAPS) += heaps/
66
obj-$(CONFIG_SYNC_FILE) += sync_file.o
77
obj-$(CONFIG_SW_SYNC) += sw_sync.o sync_debug.o
88
obj-$(CONFIG_UDMABUF) += udmabuf.o
9-
obj-$(CONFIG_DMABUF_SYSFS_STATS) += dma-buf-sysfs-stats.o
109

1110
dmabuf_selftests-y := \
1211
selftest.o \

drivers/dma-buf/dma-buf-sysfs-stats.c

Lines changed: 0 additions & 202 deletions
This file was deleted.

drivers/dma-buf/dma-buf-sysfs-stats.h

Lines changed: 0 additions & 35 deletions
This file was deleted.

0 commit comments

Comments
 (0)