projects
/
linux-2.6-microblaze.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
086ed1d
fd620fc
)
Merge tag 'mediatek-drm-next-6.13' of https://git.kernel.org/pub/scm/linux/kernel...
author
Dave Airlie
<airlied@redhat.com>
Tue, 5 Nov 2024 20:34:26 +0000
(06:34 +1000)
committer
Dave Airlie
<airlied@redhat.com>
Tue, 5 Nov 2024 20:35:03 +0000
(06:35 +1000)
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 <airlied@redhat.com>
From: Chun-Kuang Hu <chunkuang.hu@kernel.org>
Link:
https://patchwork.freedesktop.org/patch/msgid/20241104124103.8041-1-chunkuang.hu@kernel.org
1
2
Documentation/devicetree/bindings/display/mediatek/mediatek,dpi.yaml
patch
|
diff1
|
diff2
|
blob
|
history
drivers/gpu/drm/mediatek/mtk_disp_drv.h
patch
|
diff1
|
diff2
|
blob
|
history
drivers/gpu/drm/mediatek/mtk_disp_ovl_adaptor.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/gpu/drm/mediatek/mtk_drm_drv.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
Documentation/devicetree/bindings/display/mediatek/mediatek,dpi.yaml
index
497c0eb
,
b567e3d
..
0f1e556
---
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