Commit e9b71eb1 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'mediatek-drm-next-6.3' of... 

Merge tag 'mediatek-drm-next-6.3' of https://git.kernel.org/pub/scm/linux/kernel/git/chunkuang.hu/linux

 into drm-next

Mediatek DRM Next for Linux 6.3

1. Reduce the time of dsi from LP11 to sending cmd
2. Remove dependency on GEM DMA helper
3. Drop unbalanced obj unref
4. Fix the fallback for mediatek,mt8186-disp-ccorr
5. Fixup for error path.

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

From: Chun-Kuang Hu <chunkuang.hu@kernel.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20230130125811.2567-1-chunkuang.hu@kernel.org
parents 820ba9aa 137272ef

Documentation/devicetree/bindings/display/mediatek/mediatek,aal.yaml

+1 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ properties: 
      - items:

          - enum:

              - mediatek,mt8186-disp-aal

              - mediatek,mt8188-disp-aal

              - mediatek,mt8192-disp-aal

              - mediatek,mt8195-disp-aal

          - const: mediatek,mt8183-disp-aal

Documentation/devicetree/bindings/display/mediatek/mediatek,ccorr.yaml

+2 −1
Original line number Diff line number Diff line
@@ -27,12 +27,13 @@ properties: 
          - const: mediatek,mt8192-disp-ccorr

      - items:

          - enum:

              - mediatek,mt8188-disp-ccorr

              - mediatek,mt8195-disp-ccorr

          - const: mediatek,mt8192-disp-ccorr

      - items:

          - enum:

              - mediatek,mt8186-disp-ccorr

          - const: mediatek,mt8183-disp-ccorr

          - const: mediatek,mt8192-disp-ccorr



  reg:

    maxItems: 1

Documentation/devicetree/bindings/display/mediatek/mediatek,color.yaml

+1 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ properties: 
          - enum:

              - mediatek,mt8183-disp-color

              - mediatek,mt8186-disp-color

              - mediatek,mt8188-disp-color

              - mediatek,mt8192-disp-color

              - mediatek,mt8195-disp-color

          - const: mediatek,mt8173-disp-color

Documentation/devicetree/bindings/display/mediatek/mediatek,dither.yaml

+1 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ properties: 
      - items:

          - enum:

              - mediatek,mt8186-disp-dither

              - mediatek,mt8188-disp-dither

              - mediatek,mt8192-disp-dither

              - mediatek,mt8195-disp-dither

          - const: mediatek,mt8183-disp-dither

Documentation/devicetree/bindings/display/mediatek/mediatek,gamma.yaml

+1 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ properties: 
      - items:

          - enum:

              - mediatek,mt8186-disp-gamma

              - mediatek,mt8188-disp-gamma

              - mediatek,mt8192-disp-gamma

              - mediatek,mt8195-disp-gamma

          - const: mediatek,mt8183-disp-gamma