Commit 6dc1d3c1 authored by Dave Airlie's avatar Dave Airlie
Browse files

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

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

 into drm-next

drm-misc-next for v6.18:

Cross-subsystem Changes:

- Update a number of DT bindings for STM32MP25 Arm SoC

Core Changes:

gem:
- Simplify locking for GPUVM

panel-backlight-quirks:
- Add additional quirks for EDID, DMI, brightness

sched:
- Fix race condition in trace code
- Clean up

sysfb:
- Clean up

Driver Changes:

amdgpu:
- Give kernel jobs a unique id for better tracing

amdxdna:
- Improve error reporting

bridge:
- Improve ref counting on bridge management
- adv7511: Provide SPD and HDMI infoframes
- it6505: Replace crypto_shash with sha()
- synopsys: Add support for DW DPTX Controller plus DT bindings

gud:
- Replace simple-KMS pipe with regular atomic helpers

imagination:
- Improve power management
- Add support for TH1520 GPU
- Support Risc-V architectures

ivpu:
- Clean up

nouveau:
- Improve error reporting

panthor:
- Fail VM bind if BO has offset
- Clean up

rcar-du:
- Make number of lanes configurable

rockchip:
- Add support for RK3588 DPTX output

rocket:
- Use kfree() and sizeof() correctly
- Test DMA status
- Clean up

sitronix:
- st7571-i2c: Add support for inverted displays and 2-bit grayscale
- Clean up

stm:
- ltdc: Add support support for STM32MP257F-EV1 plus DT bindings

tidss:
- Convert to kernel's FIELD_ macros

v3d:
- Improve job management and locking

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

From: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://lore.kernel.org/r/20250904090932.GA193997@linux.fritz.box
parents 4bf83dd6 2a1eea8f
Loading
Loading
Loading
Loading
+21 −10
Original line number Diff line number Diff line
@@ -36,11 +36,15 @@ properties:
  clocks:
    maxItems: 1

  "#clock-cells":
    const: 0

required:
  - compatible
  - reg

if:
allOf:
  - if:
      properties:
        compatible:
          contains:
@@ -50,6 +54,13 @@ if:
    then:
      required:
        - clocks
  - if:
      properties:
        compatible:
          const: st,stm32mp25-syscfg
    then:
      required:
        - "#clock-cells"

additionalProperties: false

+150 −0
Original line number Diff line number Diff line
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
%YAML 1.2
---
$id: http://devicetree.org/schemas/display/rockchip/rockchip,dw-dp.yaml#
$schema: http://devicetree.org/meta-schemas/core.yaml#

title: Rockchip DW DisplayPort Transmitter

maintainers:
  - Andy Yan <andy.yan@rock-chips.com>

description: |
  The Rockchip RK3588 SoC integrates the Synopsys DesignWare DPTX controller
  which is compliant with the DisplayPort Specification Version 1.4 with the
  following features:

  * DisplayPort 1.4a
  * Main Link: 1/2/4 lanes
  * Main Link Support 1.62Gbps, 2.7Gbps, 5.4Gbps and 8.1Gbps
  * AUX channel 1Mbps
  * Single Stream Transport(SST)
  * Multistream Transport (MST)
  * Type-C support (alternate mode)
  * HDCP 2.2, HDCP 1.3
  * Supports up to 8/10 bits per color component
  * Supports RBG, YCbCr4:4:4, YCbCr4:2:2, YCbCr4:2:0
  * Pixel clock up to 594MHz
  * I2S, SPDIF audio interface

allOf:
  - $ref: /schemas/sound/dai-common.yaml#

properties:
  compatible:
    enum:
      - rockchip,rk3588-dp

  reg:
    maxItems: 1

  interrupts:
    maxItems: 1

  clocks:
    items:
      - description: Peripheral/APB bus clock
      - description: DisplayPort AUX clock
      - description: HDCP clock
      - description: I2S interface clock
      - description: SPDIF interfce clock

  clock-names:
    items:
      - const: apb
      - const: aux
      - const: hdcp
      - const: i2s
      - const: spdif

  phys:
    maxItems: 1

  ports:
    $ref: /schemas/graph.yaml#/properties/ports

    properties:
      port@0:
        $ref: /schemas/graph.yaml#/properties/port
        description: Video port for RGB/YUV input.

      port@1:
        $ref: /schemas/graph.yaml#/properties/port
        description: Video port for DP output.

    required:
      - port@0
      - port@1

  power-domains:
    maxItems: 1

  resets:
    maxItems: 1

  "#sound-dai-cells":
    const: 0

required:
  - compatible
  - reg
  - clocks
  - clock-names
  - interrupts
  - phys
  - ports
  - resets

unevaluatedProperties: false

examples:
  - |
    #include <dt-bindings/clock/rockchip,rk3588-cru.h>
    #include <dt-bindings/phy/phy.h>
    #include <dt-bindings/interrupt-controller/arm-gic.h>
    #include <dt-bindings/interrupt-controller/irq.h>
    #include <dt-bindings/power/rk3588-power.h>
    #include <dt-bindings/reset/rockchip,rk3588-cru.h>

    soc {
      #address-cells = <2>;
      #size-cells = <2>;

      dp@fde50000 {
        compatible = "rockchip,rk3588-dp";
        reg = <0x0 0xfde50000 0x0 0x4000>;
        interrupts = <GIC_SPI 161 IRQ_TYPE_LEVEL_HIGH 0>;
        clocks = <&cru PCLK_DP0>, <&cru CLK_AUX16M_0>,
        <&cru CLK_DP0>, <&cru MCLK_I2S4_8CH_TX>,
        <&cru MCLK_SPDIF2_DP0>;
        clock-names = "apb", "aux", "hdcp", "i2s", "spdif";
        assigned-clocks = <&cru CLK_AUX16M_0>;
        assigned-clock-rates = <16000000>;
        resets = <&cru SRST_DP0>;
        phys = <&usbdp_phy0 PHY_TYPE_DP>;
        power-domains = <&power RK3588_PD_VO0>;
        #sound-dai-cells = <0>;


        ports {
          #address-cells = <1>;
          #size-cells = <0>;

          port@0 {
            reg = <0>;

            dp0_in_vp2: endpoint {
              remote-endpoint = <&vp2_out_dp0>;
            };
          };

          port@1 {
            reg = <1>;

            dp0_out_con0: endpoint {
              remote-endpoint = <&dp_con0_in>;
            };
          };
        };
      };
    };
+5 −0
Original line number Diff line number Diff line
@@ -23,6 +23,11 @@ properties:
  reg:
    maxItems: 1

  sitronix,inverted:
    type: boolean
    description:
      Display pixels are inverted, i.e. 0 is white and 1 is black.

  width-mm: true
  height-mm: true
  panel-timing: true
+5 −0
Original line number Diff line number Diff line
@@ -28,6 +28,11 @@ properties:
    description:
      Display supports 4-level grayscale.

  sitronix,inverted:
    type: boolean
    description:
      Display pixels are inverted, i.e. 0 is white and 1 is black.

  reset-gpios: true
  width-mm: true
  height-mm: true
+53 −2
Original line number Diff line number Diff line
@@ -12,7 +12,10 @@ maintainers:

properties:
  compatible:
    const: st,stm32-ltdc
    enum:
      - st,stm32-ltdc
      - st,stm32mp251-ltdc
      - st,stm32mp255-ltdc

  reg:
    maxItems: 1
@@ -24,15 +27,23 @@ properties:
    minItems: 1

  clocks:
    maxItems: 1
    minItems: 1
    maxItems: 4

  clock-names:
    items:
      - const: lcd
      - const: bus
      - const: ref
      - const: lvds
    minItems: 1

  resets:
    maxItems: 1

  access-controllers:
    maxItems: 1

  port:
    $ref: /schemas/graph.yaml#/properties/port
    description: |
@@ -51,6 +62,46 @@ required:
  - resets
  - port

allOf:
  - if:
      properties:
        compatible:
          contains:
            enum:
              - st,stm32-ltdc
    then:
      properties:
        clocks:
          maxItems: 1
        clock-names:
          maxItems: 1
  - if:
      properties:
        compatible:
          contains:
            enum:
              - st,stm32mp251-ltdc
    then:
      properties:
        clocks:
          minItems: 2
          maxItems: 2
        clock-names:
          minItems: 2
          maxItems: 2
  - if:
      properties:
        compatible:
          contains:
            enum:
              - st,stm32mp255-ltdc
    then:
      properties:
        clocks:
          minItems: 4
        clock-names:
          minItems: 4

additionalProperties: false

examples:
Loading