Commit 683058df authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-misc-next-2025-04-09' of... 

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

# Conflicts:
#	include/drm/drm_kunit_helpers.h
From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: https://lore.kernel.org/r/e147ff95-697b-4067-9e2e-7cbd424e162a@linux.intel.com
parents 8ffd015d e8bf4a1b

.clang-format

+7 −0
Original line number Diff line number Diff line
@@ -690,6 +690,13 @@ ForEachMacros: 
  - 'v4l2_m2m_for_each_src_buf'

  - 'v4l2_m2m_for_each_src_buf_safe'

  - 'virtio_device_for_each_vq'

  - 'vkms_config_for_each_connector'

  - 'vkms_config_for_each_crtc'

  - 'vkms_config_for_each_encoder'

  - 'vkms_config_for_each_plane'

  - 'vkms_config_connector_for_each_possible_encoder'

  - 'vkms_config_encoder_for_each_possible_crtc'

  - 'vkms_config_plane_for_each_possible_crtc'

  - 'while_for_each_ftrace_op'

  - 'xa_for_each'

  - 'xa_for_each_marked'

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

+2 −0
Original line number Diff line number Diff line
@@ -246,6 +246,8 @@ properties: 
      - osddisplays,osd070t1718-19ts

        # One Stop Displays OSD101T2045-53TS 10.1" 1920x1200 panel

      - osddisplays,osd101t2045-53ts

        # POWERTIP PH128800T004-ZZA01 10.1" WXGA TFT LCD panel

      - powertip,ph128800t004-zza01

        # POWERTIP PH128800T006-ZHC01 10.1" WXGA TFT LCD panel

      - powertip,ph128800t006-zhc01

        # POWERTIP PH800480T013-IDF2 7.0" WVGA TFT LCD panel

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

+2 −0
Original line number Diff line number Diff line
@@ -19,6 +19,8 @@ properties: 
      - const: samsung,atna33xc20

      - items:

          - enum:

              # Samsung 14" WQXGA+ (2880×1800 pixels) eDP AMOLED panel

              - samsung,atna40yk20

              # Samsung 14.5" WQXGA+ (2880x1800 pixels) eDP AMOLED panel

              - samsung,atna45af01

              # Samsung 14.5" 3K (2944x1840 pixels) eDP AMOLED panel

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

+76 −14
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml# 
title: Broadcom V3D GPU



maintainers:

  - Eric Anholt <eric@anholt.net>

  - Maíra Canal <mcanal@igalia.com>

  - Nicolas Saenz Julienne <nsaenzjulienne@suse.de>



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



  reg:

    items:

      - description: hub register (required)

      - description: core0 register (required)

      - description: GCA cache controller register (if GCA controller present)

      - description: bridge register (if no external reset controller)

    minItems: 2

    maxItems: 4



  reg-names:

    items:

      - const: hub

      - const: core0

      - enum: [ bridge, gca ]

      - enum: [ bridge, gca ]

    minItems: 2

    maxItems: 4



  interrupts:

    items:
@@ -58,6 +50,76 @@ required: 
  - reg-names

  - interrupts



allOf:

  - if:

      properties:

        compatible:

          contains:

            const: brcm,2711-v3d

    then:

      properties:

        reg:

          items:

            - description: hub register

            - description: core0 register

        reg-names:

          items:

            - const: hub

            - const: core0

  - if:

      properties:

        compatible:

          contains:

            const: brcm,2712-v3d

    then:

      properties:

        reg:

          items:

            - description: hub register

            - description: core0 register

            - description: SMS state manager register

        reg-names:

          items:

            - const: hub

            - const: core0

            - const: sms

  - if:

      properties:

        compatible:

          contains:

            const: brcm,7268-v3d

    then:

      properties:

        reg:

          items:

            - description: hub register

            - description: core0 register

            - description: GCA cache controller register

            - description: bridge register

        reg-names:

          items:

            - const: hub

            - const: core0

            - const: gca

            - const: bridge

  - if:

      properties:

        compatible:

          contains:

            const: brcm,7278-v3d

    then:

      properties:

        reg:

          items:

            - description: hub register

            - description: core0 register

            - description: bridge register

        reg-names:

          items:

            - const: hub

            - const: core0

            - const: bridge



additionalProperties: false



examples:
@@ -66,9 +128,9 @@ examples: 
      compatible = "brcm,7268-v3d";

      reg = <0xf1200000 0x4000>,

            <0xf1208000 0x4000>,

            <0xf1204000 0x100>,

            <0xf1204100 0x100>;

      reg-names = "hub", "core0", "bridge", "gca";

            <0xf1204100 0x100>,

            <0xf1204000 0x100>;

      reg-names = "hub", "core0", "gca", "bridge";

      interrupts = <0 78 4>,

                   <0 77 4>;

    };

Documentation/gpu/automated_testing.rst

+4 −0
Original line number Diff line number Diff line
@@ -115,6 +115,10 @@ created (eg. https://gitlab.freedesktop.org/janedoe/linux/-/pipelines) 
5. The various jobs will be run and when the pipeline is finished, all jobs

should be green unless a regression has been found.



6. Warnings in the pipeline indicate that lockdep

(see Documentation/locking/lockdep-design.rst) issues have been detected

during the tests.





How to update test expectations

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