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

Mediatek DRM Next for Linux 6.13

1. Add support for OF graphs
2. Fix child node refcount handling and use scoped

Signed-off-by: Dave Airlie <[email protected]>
From: Chun-Kuang Hu <[email protected]>
Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]

diff --cc Documentation/devicetree/bindings/display/mediatek/mediatek,dpi.yaml
index 497c0eb4ed0b5e2f57f60859f56a1a42fed4f40d,b567e3d58aa1d6ac8fce076feb336660e2b560a9..0f1e556dc8ef3d4668ada0f925e4f1f0f6662c08
--- 1/Documentation/devicetree/bindings/display/mediatek/mediatek,dpi.yaml
--- 2/Documentation/devicetree/bindings/display/mediatek/mediatek,dpi.yaml
+++ b/Documentation/devicetree/bindings/display/mediatek/mediatek,dpi.yaml
@@@ -87,8 -93,27 +103,13 @@@ required
    - interrupts
    - clocks
    - clock-names
-   - port
+ 
+ oneOf:
+   - required:
+       - port
+   - required:
+       - ports
  
 -allOf:
 -  - if:
 -      not:
 -        properties:
 -          compatible:
 -            contains:
 -              enum:
 -                - mediatek,mt6795-dpi
 -                - mediatek,mt8173-dpi
 -                - mediatek,mt8186-dpi
 -    then:
 -      properties:
 -        power-domains: false
 -
  additionalProperties: false
  
  examples:

diff --cc drivers/gpu/drm/mediatek/mtk_disp_drv.h
Simple merge

diff --cc drivers/gpu/drm/mediatek/mtk_disp_ovl_adaptor.c
Simple merge

diff --cc drivers/gpu/drm/mediatek/mtk_drm_drv.c
Simple merge