Commit 098456f3 authored by Simona Vetter's avatar Simona Vetter
Browse files

Merge tag 'drm-misc-next-2025-10-21' of... 

Merge tag 'drm-misc-next-2025-10-21' of https://gitlab.freedesktop.org/drm/misc/kernel

 into drm-next

drm-misc-next for v6.19:

UAPI Changes:

amdxdna:
- Support reading last hardware error

Cross-subsystem Changes:

dma-buf:
- heaps: Create heap per CMA reserved location; Improve user-space documentation

Core Changes:

atomic:
- Clean up and improve state-handling interfaces, update drivers

bridge:
- Improve ref counting

buddy:
- Optimize block management

Driver Changes:

amdxdna:
- Fix runtime power management
- Support firmware debug output

ast:
- Set quirks for each chip model

atmel-hlcdc:
- Set LCDC_ATTRE register in plane disable
- Set correct values for plane scaler

bochs:
- Use vblank timer

bridge:
- synopsis: Support CEC; Init timer with correct frequency

cirrus-qemu:
- Use vblank timer

imx:
- Clean up

ivu:
- Update JSM API to 3.33.0
- Reset engine on more job errors
- Return correct error codes for jobs

komeda:
- Use drm_ logging functions

panel:
- edp: Support AUO B116XAN02.0

panfrost:
- Embed struct drm_driver in Panfrost device
- Improve error handling
- Clean up job handling

panthor:
- Support custom ASN_HASH for mt8196

renesas:
- rz-du: Fix dependencies

rockchip:
- dsi: Add support for RK3368
- Fix LUT size for RK3386

sitronix:
- Fix output position when clearing screens

qaic:
- Support dma-buf exports
- Support new firmware's READ_DATA implementation
- Replace kcalloc with memdup
- Replace snprintf() with sysfs_emit()
- Avoid overflows in arithmetics
- Clean up
- Fixes

qxl:
- Use vblank timer

rockchip:
- Clean up mode-setting code

vgem:
- Fix fence timer deadlock

virtgpu:
- Use vblank timer

Signed-off-by: default avatarSimona Vetter <simona.vetter@ffwll.ch>

From: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://lore.kernel.org/r/20251021111837.GA40643@linux.fritz.box
parents 6200442d 7ea04683

Documentation/devicetree/bindings/display/rockchip/rockchip,dw-mipi-dsi.yaml

+2 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ properties: 
          - rockchip,px30-mipi-dsi

          - rockchip,rk3128-mipi-dsi

          - rockchip,rk3288-mipi-dsi

          - rockchip,rk3368-mipi-dsi

          - rockchip,rk3399-mipi-dsi

          - rockchip,rk3568-mipi-dsi

          - rockchip,rv1126-mipi-dsi
@@ -73,6 +74,7 @@ allOf: 
            enum:

              - rockchip,px30-mipi-dsi

              - rockchip,rk3128-mipi-dsi

              - rockchip,rk3368-mipi-dsi

              - rockchip,rk3568-mipi-dsi

              - rockchip,rv1126-mipi-dsi

Documentation/devicetree/bindings/gpu/arm,mali-valhall-csf.yaml

+3 −1
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ properties: 
    oneOf:

      - items:

          - enum:

              - mediatek,mt8196-mali

              - rockchip,rk3588-mali

          - const: arm,mali-valhall-csf   # Mali Valhall GPU model/revision is fully discoverable
@@ -91,7 +92,6 @@ required: 
  - interrupts

  - interrupt-names

  - clocks

  - mali-supply



additionalProperties: false
@@ -108,6 +108,8 @@ allOf: 
        power-domains:

          maxItems: 1

        power-domain-names: false

      required:

        - mali-supply



examples:

  - |

Documentation/userspace-api/dma-buf-heaps.rst

+49 −10
Original line number Diff line number Diff line
@@ -16,13 +16,52 @@ following heaps: 


 - The ``system`` heap allocates virtually contiguous, cacheable, buffers.



 - The ``cma`` heap allocates physically contiguous, cacheable,

   buffers. Only present if a CMA region is present. Such a region is

   usually created either through the kernel commandline through the

   ``cma`` parameter, a memory region Device-Tree node with the

   ``linux,cma-default`` property set, or through the ``CMA_SIZE_MBYTES`` or

   ``CMA_SIZE_PERCENTAGE`` Kconfig options. The heap's name in devtmpfs is

   ``default_cma_region``. For backwards compatibility, when the

   ``DMABUF_HEAPS_CMA_LEGACY`` Kconfig option is set, a duplicate node is

   created following legacy naming conventions; the legacy name might be

   ``reserved``, ``linux,cma``, or ``default-pool``.
 
 - The ``default_cma_region`` heap allocates physically contiguous,

   cacheable, buffers. Only present if a CMA region is present. Such a

   region is usually created either through the kernel commandline

   through the ``cma`` parameter, a memory region Device-Tree node with

   the ``linux,cma-default`` property set, or through the

   ``CMA_SIZE_MBYTES`` or ``CMA_SIZE_PERCENTAGE`` Kconfig options. Prior

   to Linux 6.17, its name wasn't stable and could be called

   ``reserved``, ``linux,cma``, or ``default-pool``, depending on the

   platform.



 - A heap will be created for each reusable region in the device tree

   with the ``shared-dma-pool`` compatible, using the full device tree

   node name as its name. The buffer semantics are identical to

   ``default-cma-region``.



Naming Convention

=================



``dma-buf`` heaps name should meet a number of constraints:



- The name must be stable, and must not change from one version to the other.

  Userspace identifies heaps by their name, so if the names ever change, we

  would be likely to introduce regressions.



- The name must describe the memory region the heap will allocate from, and

  must uniquely identify it in a given platform. Since userspace applications

  use the heap name as the discriminant, it must be able to tell which heap it

  wants to use reliably if there's multiple heaps.



- The name must not mention implementation details, such as the allocator. The

  heap driver will change over time, and implementation details when it was

  introduced might not be relevant in the future.



- The name should describe properties of the buffers that would be allocated.

  Doing so will make heap identification easier for userspace. Such properties

  are:



  - ``contiguous`` for physically contiguous buffers;



  - ``protected`` for encrypted buffers not accessible the OS;



- The name may describe intended usage. Doing so will make heap identification

  easier for userspace applications and users.



For example, assuming a platform with a reserved memory region located

at the RAM address 0x42000000, intended to allocate video framebuffers,

physically contiguous, and backed by the CMA kernel allocator, good

names would be ``memory@42000000-contiguous`` or ``video@42000000``, but

``cma-video`` wouldn't.

MAINTAINERS

+7 −6
Original line number Diff line number Diff line
@@ -2092,7 +2092,8 @@ F: drivers/gpu/drm/arm/display/komeda/ 
ARM MALI PANFROST DRM DRIVER

M:	Boris Brezillon <boris.brezillon@collabora.com>

M:	Rob Herring <robh@kernel.org>

R:	Steven Price <steven.price@arm.com>

M:	Steven Price <steven.price@arm.com>

M:	Adrián Larumbe <adrian.larumbe@collabora.com>

L:	dri-devel@lists.freedesktop.org

S:	Supported

T:	git https://gitlab.freedesktop.org/drm/misc/kernel.git
@@ -7309,6 +7310,7 @@ F: Documentation/userspace-api/dma-buf-alloc-exchange.rst 
F:	drivers/dma-buf/

F:	include/linux/*fence.h

F:	include/linux/dma-buf.h

F:	include/linux/dma-buf/

F:	include/linux/dma-resv.h

K:	\bdma_(?:buf|fence|resv)\b








@@ -7637,7 +7639,6 @@ F:	drivers/accel/







F:	include/drm/drm_accel.h

















DRM DRIVER FOR ALLWINNER DE2 AND DE3 ENGINE









M:	Maxime Ripard <mripard@kernel.org>









M:	Chen-Yu Tsai <wens@csie.org>









R:	Jernej Skrabec <jernej.skrabec@gmail.com>









L:	dri-devel@lists.freedesktop.org








@@ -7747,7 +7748,8 @@ F:	Documentation/devicetree/bindings/display/panel/panel-edp.yaml







F:	drivers/gpu/drm/panel/panel-edp.c

















DRM DRIVER FOR GENERIC USB DISPLAY









S:	Orphan









M:	Ruben Wauters <rubenru09@aol.com>









S:	Maintained









W:	https://github.com/notro/gud/wiki









T:	git https://gitlab.freedesktop.org/drm/misc/kernel.git









F:	drivers/gpu/drm/gud/








@@ -7888,7 +7890,7 @@ DRM DRIVER for Qualcomm display hardware







M:	Rob Clark <robin.clark@oss.qualcomm.com>









M:	Dmitry Baryshkov <lumag@kernel.org>









R:	Abhinav Kumar <abhinav.kumar@linux.dev>









R:	Jessica Zhang <jessica.zhang@oss.qualcomm.com>









R:	Jessica Zhang <jesszhan0024@gmail.com>









R:	Sean Paul <sean@poorly.run>









R:	Marijn Suijten <marijn.suijten@somainline.org>









L:	linux-arm-msm@vger.kernel.org








@@ -8251,7 +8253,6 @@ F:	drivers/gpu/nova-core/







F:	rust/kernel/drm/

















DRM DRIVERS FOR ALLWINNER A10









M:	Maxime Ripard <mripard@kernel.org>









M:	Chen-Yu Tsai <wens@csie.org>









L:	dri-devel@lists.freedesktop.org









S:	Supported








@@ -8601,7 +8602,7 @@ F:	drivers/gpu/drm/clients/drm_log.c















DRM PANEL DRIVERS









M:	Neil Armstrong <neil.armstrong@linaro.org>









R:	Jessica Zhang <jessica.zhang@oss.qualcomm.com>









R:	Jessica Zhang <jesszhan0024@gmail.com>









L:	dri-devel@lists.freedesktop.org









S:	Maintained









T:	git https://gitlab.freedesktop.org/drm/misc/kernel.git
































drivers/accel/amdxdna/TODO



+0
−1






























Original line number
Diff line number
Diff line









- Add debugfs support








- Add debug BO support