Commit 15e2b419 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-misc-next-2022-04-28' of git://anongit.freedesktop.org/drm/drm-misc into drm-next 



drm-misc-next for 5.19:

UAPI Changes:

Cross-subsystem Changes:

Core Changes:
  - Introduction of display-helper module, and rework of the DP, DSC,
    HDCP, HDMI and SCDC headers
  - doc: Improvements for tiny drivers, link to external resources
  - formats: helper to convert from RGB888 and RGB565 to XRGB8888
  - modes: make width-mm/height-mm check mandatory in of_get_drm_panel_display_mode
  - ttm: Convert from kvmalloc_array to kvcalloc

Driver Changes:
  - bridge:
    - analogix_dp: Fix error handling in probe
    - dw_hdmi: Coccinelle fixes
    - it6505: Fix Kconfig dependency on DRM_DP_AUX_BUS
  - panel:
    - new panel: DataImage FG040346DSSWBG04
  - amdgpu: ttm_eu cleanups
  - mxsfb: Rework CRTC mode setting
  - nouveau: Make some variables static
  - sun4i: Drop drm_display_info.is_hdmi caching, support for the
    Allwinner D1
  - vc4: Drop drm_display_info.is_hdmi caching
  - vmwgfx: Fence improvements

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

# gpg: Signature made Thu 28 Apr 2022 17:52:13 AEST
# gpg:                using EDDSA key 5C1337A45ECA9AEB89060E9EE3EF0D6F671851C5
# gpg: Can't check signature: No public key
From: Maxime Ripard <maxime@cerno.tech>
Link: https://patchwork.freedesktop.org/patch/msgid/20220428075237.yypztjha7hetphcd@houat
parents 9bda072a e08a99d0

Documentation/devicetree/bindings/display/allwinner,sun4i-a10-display-engine.yaml

+1 −0
Original line number Diff line number Diff line
@@ -62,6 +62,7 @@ properties: 
      - allwinner,sun8i-r40-display-engine

      - allwinner,sun8i-v3s-display-engine

      - allwinner,sun9i-a80-display-engine

      - allwinner,sun20i-d1-display-engine

      - allwinner,sun50i-a64-display-engine

      - allwinner,sun50i-h6-display-engine

Documentation/devicetree/bindings/display/allwinner,sun4i-a10-tcon.yaml

+2 −0
Original line number Diff line number Diff line
@@ -33,6 +33,8 @@ properties: 
      - const: allwinner,sun8i-v3s-tcon

      - const: allwinner,sun9i-a80-tcon-lcd

      - const: allwinner,sun9i-a80-tcon-tv

      - const: allwinner,sun20i-d1-tcon-lcd

      - const: allwinner,sun20i-d1-tcon-tv



      - items:

          - enum:

Documentation/devicetree/bindings/display/allwinner,sun8i-a83t-de2-mixer.yaml

+2 −0
Original line number Diff line number Diff line
@@ -19,6 +19,8 @@ properties: 
      - allwinner,sun8i-r40-de2-mixer-0

      - allwinner,sun8i-r40-de2-mixer-1

      - allwinner,sun8i-v3s-de2-mixer

      - allwinner,sun20i-d1-de2-mixer-0

      - allwinner,sun20i-d1-de2-mixer-1

      - allwinner,sun50i-a64-de2-mixer-0

      - allwinner,sun50i-a64-de2-mixer-1

      - allwinner,sun50i-h6-de3-mixer-0

Documentation/devicetree/bindings/display/allwinner,sun8i-r40-tcon-top.yaml

+89 −44
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ properties: 
  compatible:

    enum:

      - allwinner,sun8i-r40-tcon-top

      - allwinner,sun20i-d1-tcon-top

      - allwinner,sun50i-h6-tcon-top



  reg:
@@ -48,31 +49,15 @@ properties: 


  clocks:

    minItems: 2

    items:

      - description: The TCON TOP interface clock

      - description: The TCON TOP TV0 clock

      - description: The TCON TOP TVE0 clock

      - description: The TCON TOP TV1 clock

      - description: The TCON TOP TVE1 clock

      - description: The TCON TOP MIPI DSI clock

    maxItems: 6



  clock-names:

    minItems: 2

    items:

      - const: bus

      - const: tcon-tv0

      - const: tve0

      - const: tcon-tv1

      - const: tve1

      - const: dsi

    maxItems: 6



  clock-output-names:

    minItems: 1

    maxItems: 3

    description: >

      The first item is the name of the clock created for the TV0

      channel, the second item is the name of the TCON TV1 channel

      clock and the third one is the name of the DSI channel clock.



  resets:

    maxItems: 1
@@ -129,33 +114,93 @@ required: 


additionalProperties: false



if:

allOf:

  - if:

      properties:

        compatible:

          contains:

        const: allwinner,sun50i-h6-tcon-top

            const: allwinner,sun8i-r40-tcon-top



    then:

      properties:

        clocks:

      maxItems: 2



    clock-output-names:

      maxItems: 1

          items:

            - description: The TCON TOP interface clock

            - description: The TCON TOP TV0 clock

            - description: The TCON TOP TVE0 clock

            - description: The TCON TOP TV1 clock

            - description: The TCON TOP TVE1 clock

            - description: The TCON TOP MIPI DSI clock



else:

  properties:

    clocks:

      minItems: 6

        clock-names:

          items:

            - const: bus

            - const: tcon-tv0

            - const: tve0

            - const: tcon-tv1

            - const: tve1

            - const: dsi



        clock-output-names:

      minItems: 3

          items:

            - description: TCON TV0 output clock name

            - description: TCON TV1 output clock name

            - description: DSI output clock name



        ports:

          required:

            - port@2

            - port@3



  - if:

      properties:

        compatible:

          contains:

            const: allwinner,sun20i-d1-tcon-top



    then:

      properties:

        clocks:

          items:

            - description: The TCON TOP interface clock

            - description: The TCON TOP TV0 clock

            - description: The TCON TOP TVE0 clock

            - description: The TCON TOP MIPI DSI clock



        clock-names:

          items:

            - const: bus

            - const: tcon-tv0

            - const: tve0

            - const: dsi



        clock-output-names:

          items:

            - description: TCON TV0 output clock name

            - description: DSI output clock name



  - if:

      properties:

        compatible:

          contains:

            const: allwinner,sun50i-h6-tcon-top



    then:

      properties:

        clocks:

          items:

            - description: The TCON TOP interface clock

            - description: The TCON TOP TV0 clock



        clock-names:

          items:

            - const: bus

            - const: tcon-tv0



        clock-output-names:

          items:

            - description: TCON TV0 output clock name



examples:

  - |

    #include <dt-bindings/interrupt-controller/arm-gic.h>

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

+2 −0
Original line number Diff line number Diff line
@@ -105,6 +105,8 @@ properties: 
      - chunghwa,claa101wb01

        # Chunghwa Picture Tubes Ltd. 10.1" WXGA TFT LCD panel

      - chunghwa,claa101wb03

        # DataImage, Inc. 4.3" WQVGA (480x272) TFT LCD panel with 24-bit parallel interface.

      - dataimage,fg040346dsswbg04

        # DataImage, Inc. 7" WVGA (800x480) TFT LCD panel with 24-bit parallel interface.

      - dataimage,scf0700c48ggu18

        # DLC Display Co. DLC1010GIG 10.1" WXGA TFT LCD Panel