Commit 7bc0f871 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-misc-next-2025-12-19' of...

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

 into drm-next

drm-misc-next for 6.20:

Core Changes:

  - dma-buf: Add tracepoints
  - sched: Introduce new helpers

Driver Changes:

  - amdxdna: Enable hardware context priority, Remove (obsolete and
    never public) NPU2 Support, Race condition fix
  - rockchip: Add RK3368 HDMI Support
  - rz-du: Add RZ/V2H(P) MIPI-DSI Support

  - panels:
    - st7571: Introduce SPI support
    - New panels: Sitronix ST7920, Samsung LTL106HL02, LG LH546WF1-ED01, HannStar HSD156JUW2

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

From: Maxime Ripard <mripard@redhat.com>
Link: https://patch.msgid.link/20251219-arcane-quaint-skunk-e383b0@houat
parents 6c8e4048 33207079
Loading
Loading
Loading
Loading
+91 −29
Original line number Diff line number Diff line
@@ -14,17 +14,22 @@ description: |
  RZ/G2L alike family of SoC's. The encoder can operate in DSI mode, with
  up to four data lanes.

allOf:
  - $ref: /schemas/display/dsi-controller.yaml#

properties:
  compatible:
    items:
    oneOf:
      - items:
          - enum:
              - renesas,r9a07g044-mipi-dsi # RZ/G2{L,LC}
              - renesas,r9a07g054-mipi-dsi # RZ/V2L
          - const: renesas,rzg2l-mipi-dsi

      - items:
          - const: renesas,r9a09g056-mipi-dsi # RZ/V2N
          - const: renesas,r9a09g057-mipi-dsi

      - enum:
          - renesas,r9a09g057-mipi-dsi # RZ/V2H(P)

  reg:
    maxItems: 1

@@ -49,34 +54,56 @@ properties:
      - const: debug

  clocks:
    items:
    oneOf:
      - items:
          - description: DSI D-PHY PLL multiplied clock
          - description: DSI D-PHY system clock
          - description: DSI AXI bus clock
          - description: DSI Register access clock
          - description: DSI Video clock
          - description: DSI D-PHY Escape mode transmit clock
      - items:
          - description: DSI D-PHY PLL reference clock
          - description: DSI AXI bus clock
          - description: DSI Register access clock
          - description: DSI Video clock
          - description: DSI D-PHY Escape mode transmit clock

  clock-names:
    items:
    oneOf:
      - items:
          - const: pllclk
          - const: sysclk
          - const: aclk
          - const: pclk
          - const: vclk
          - const: lpclk
      - items:
          - const: pllrefclk
          - const: aclk
          - const: pclk
          - const: vclk
          - const: lpclk

  resets:
    items:
    oneOf:
      - items:
          - description: MIPI_DSI_CMN_RSTB
          - description: MIPI_DSI_ARESET_N
          - description: MIPI_DSI_PRESET_N
      - items:
          - description: MIPI_DSI_ARESET_N
          - description: MIPI_DSI_PRESET_N

  reset-names:
    items:
    oneOf:
      - items:
          - const: rst
          - const: arst
          - const: prst
      - items:
          - const: arst
          - const: prst

  power-domains:
    maxItems: 1
@@ -130,6 +157,41 @@ required:

unevaluatedProperties: false

allOf:
  - $ref: ../dsi-controller.yaml#

  - if:
      properties:
        compatible:
          contains:
            const: renesas,r9a09g057-mipi-dsi
    then:
      properties:
        clocks:
          maxItems: 5

        clock-names:
          maxItems: 5

        resets:
          maxItems: 2

        reset-names:
          maxItems: 2
    else:
      properties:
        clocks:
          minItems: 6

        clock-names:
          minItems: 6

        resets:
          minItems: 3

        reset-names:
          minItems: 3

examples:
  - |
    #include <dt-bindings/clock/r9a07g044-cpg.h>
+9 −4
Original line number Diff line number Diff line
@@ -4,14 +4,16 @@
$id: http://devicetree.org/schemas/display/panel/lg,sw43408.yaml#
$schema: http://devicetree.org/meta-schemas/core.yaml#

title: LG SW43408 1080x2160 DSI panel
title: LG SW43408 AMOLED DDIC

maintainers:
  - Casey Connolly <casey.connolly@linaro.org>

description:
  This panel is used on the Pixel 3, it is a 60hz OLED panel which
  required DSC (Display Stream Compression) and has rounded corners.
  The SW43408 is display driver IC with connected panel.

  LG LH546WF1-ED01 panel is used on the Pixel 3, it is a 60hz OLED panel
  which required DSC (Display Stream Compression) and has rounded corners.

allOf:
  - $ref: panel-common.yaml#
@@ -19,6 +21,9 @@ allOf:
properties:
  compatible:
    items:
      - enum:
            # LG 5.46 inch, 1080x2160 pixels, 18:9 ratio
          - lg,sw43408-lh546wf1-ed01
      - const: lg,sw43408

  reg:
@@ -46,7 +51,7 @@ examples:
        #size-cells = <0>;

        panel@0 {
            compatible = "lg,sw43408";
            compatible = "lg,sw43408-lh546wf1-ed01", "lg,sw43408";
            reg = <0>;

            vddi-supply = <&vreg_l14a_1p88>;
+2 −0
Original line number Diff line number Diff line
@@ -55,6 +55,8 @@ properties:
      - panasonic,vvx10f004b00
        # Panasonic 10" WUXGA TFT LCD panel
      - panasonic,vvx10f034n00
        # Samsung ltl106hl02 10.6" Full HD TFT LCD panel
      - samsung,ltl106hl02-001
        # Samsung s6e3fa7 1080x2220 based AMS559NK06 AMOLED panel
      - samsung,s6e3fa7-ams559nk06
        # Shangai Top Display Optoelectronics 7" TL070WSH30 1024x600 TFT LCD panel
+2 −0
Original line number Diff line number Diff line
@@ -154,6 +154,8 @@ properties:
      - hannstar,hsd070pww1
        # HannStar Display Corp. HSD100PXN1 10.1" XGA LVDS panel
      - hannstar,hsd100pxn1
        # HannStar Display Corp. HSD156JUW2 15.6" FHD (1920x1080) TFT LCD panel
      - hannstar,hsd156juw2
        # Hitachi Ltd. Corporation 9" WVGA (800x480) TFT LCD panel
      - hit,tx23d38vm0caa
        # Innolux AT043TN24 4.3" WQVGA TFT LCD panel
+8 −12
Original line number Diff line number Diff line
@@ -6,11 +6,11 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#

title: Samsung S6E3FC2X01 AMOLED DDIC

description: The S6E3FC2X01 is display driver IC with connected panel.

maintainers:
  - David Heidelberg <david@ixit.cz>

description: The S6E3FC2X01 is display driver IC with connected panel.

allOf:
  - $ref: panel-common.yaml#

@@ -25,25 +25,21 @@ properties:
  reg:
    maxItems: 1

  reset-gpios: true

  port: true

  vddio-supply:
    description: VDD regulator
  poc-supply:
    description: POC regulator

  vci-supply:
    description: VCI regulator

  poc-supply:
    description: POC regulator
  vddio-supply:
    description: VDD regulator

required:
  - compatible
  - reset-gpios
  - vddio-supply
  - vci-supply
  - poc-supply
  - vci-supply
  - vddio-supply

unevaluatedProperties: false

Loading