Commit b2c6627e authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-misc-next-2026-01-22' of... 

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: default avatarDave Airlie <airlied@redhat.com>

From: Maxime Ripard <mripard@redhat.com>
Link: https://patch.msgid.link/20260122-antique-sexy-junglefowl-1bc5a8@houat
parents d2f618b8 68b271a3

.mailmap

+3 −1
Original line number Diff line number Diff line
@@ -373,7 +373,9 @@ Jesper Dangaard Brouer <hawk@kernel.org> <hawk@comx.dk> 
Jesper Dangaard Brouer <hawk@kernel.org> <jbrouer@redhat.com>

Jesper Dangaard Brouer <hawk@kernel.org> <jdb@comx.dk>

Jesper Dangaard Brouer <hawk@kernel.org> <netoptimizer@brouer.com>

Jessica Zhang <quic_jesszhan@quicinc.com> <jesszhan@codeaurora.org>

Jessica Zhang <jesszhan0024@gmail.com> <jesszhan@codeaurora.org>

Jessica Zhang <jesszhan0024@gmail.com> <quic_jesszhan@quicinc.com>

Jessica Zhang <jesszhan0024@gmail.com> <jessica.zhang@oss.qualcomm.com>

Jilai Wang <quic_jilaiw@quicinc.com> <jilaiw@codeaurora.org>

Jiri Kosina <jikos@kernel.org> <jikos@jikos.cz>

Jiri Kosina <jikos@kernel.org> <jkosina@suse.cz>

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

deleted100644 → 0
+0 −24
Original line number Diff line number Diff line 
What:		/sys/kernel/dmabuf/buffers

Date:		May 2021

KernelVersion:	v5.13

Contact:	Hridya Valsaraju <hridya@google.com>

Description:	The /sys/kernel/dmabuf/buffers directory contains a

		snapshot of the internal state of every DMA-BUF.

		/sys/kernel/dmabuf/buffers/<inode_number> will contain the

		statistics for the DMA-BUF with the unique inode number

		<inode_number>

Users:		kernel memory tuning/debugging tools



What:		/sys/kernel/dmabuf/buffers/<inode_number>/exporter_name

Date:		May 2021

KernelVersion:	v5.13

Contact:	Hridya Valsaraju <hridya@google.com>

Description:	This file is read-only and contains the name of the exporter of

		the DMA-BUF.



What:		/sys/kernel/dmabuf/buffers/<inode_number>/size

Date:		May 2021

KernelVersion:	v5.13

Contact:	Hridya Valsaraju <hridya@google.com>

Description:	This file is read-only and specifies the size of the DMA-BUF in

		bytes.

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

+1 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ properties: 
          - const: adi,adv7123

      - enum:

          - adi,adv7123

          - algoltek,ag6311

          - asl-tek,cs5263

          - dumb-vga-dac

          - parade,ps185hdm

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

+2 −0
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ properties: 
  compatible:

    items:

      - enum:

          - anbernic,rg-ds-display-bottom

          - anbernic,rg-ds-display-top

          - chongzhou,cz101b4001

          - kingdisplay,kd101ne3-40ti

          - melfas,lmfbx101117480

Documentation/devicetree/bindings/vendor-prefixes.yaml

+2 −0
Original line number Diff line number Diff line
@@ -86,6 +86,8 @@ patternProperties: 
    description: Aldec, Inc.

  "^alfa-network,.*":

    description: ALFA Network Inc.

  "^algoltek,.*":

    description: AlgolTek, Inc.

  "^allegro,.*":

    description: Allegro DVT

  "^allegromicro,.*":