Skip to content

Commit 2236a61

Browse files
committed
Merge tag 'mediatek-drm-next-6.10' of https://git.kernel.org/pub/scm/linux/kernel/git/chunkuang.hu/linux into drm-next
Mediatek DRM Next for Linux 6.10 1. Use devm_platform_get_and_ioremap_resource() in mtk_hdmi_ddc_probe() 2. Add GAMMA 12-bit LUT support for MT8188 3. Add 0 size check to mtk_drm_gem_obj 4. Init `ddp_comp` with devm_kcalloc() 5. Rename mtk_drm_* to mtk_* 6. Drop driver owner initialization 7. Fix mtk_dp_aux_transfer return value 8. Correct calculation formula of PHY Timing Signed-off-by: Dave Airlie <[email protected]> From: Chun-Kuang Hu <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
2 parents 9aa99bb + 417d8c4 commit 2236a61

30 files changed

+305
-314
lines changed

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ properties:
2424
- enum:
2525
- mediatek,mt8173-disp-gamma
2626
- mediatek,mt8183-disp-gamma
27+
- mediatek,mt8195-disp-gamma
2728
- items:
2829
- enum:
2930
- mediatek,mt6795-disp-gamma
@@ -35,6 +36,10 @@ properties:
3536
- mediatek,mt8192-disp-gamma
3637
- mediatek,mt8195-disp-gamma
3738
- const: mediatek,mt8183-disp-gamma
39+
- items:
40+
- enum:
41+
- mediatek,mt8188-disp-gamma
42+
- const: mediatek,mt8195-disp-gamma
3843

3944
reg:
4045
maxItems: 1

drivers/gpu/drm/mediatek/Makefile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
# SPDX-License-Identifier: GPL-2.0
22

3-
mediatek-drm-y := mtk_disp_aal.o \
3+
mediatek-drm-y := mtk_crtc.o \
4+
mtk_ddp_comp.o \
5+
mtk_disp_aal.o \
46
mtk_disp_ccorr.o \
57
mtk_disp_color.o \
68
mtk_disp_gamma.o \
79
mtk_disp_merge.o \
810
mtk_disp_ovl.o \
911
mtk_disp_ovl_adaptor.o \
1012
mtk_disp_rdma.o \
11-
mtk_drm_crtc.o \
12-
mtk_drm_ddp_comp.o \
1313
mtk_drm_drv.o \
14-
mtk_drm_gem.o \
15-
mtk_drm_plane.o \
1614
mtk_dsi.o \
1715
mtk_dpi.o \
1816
mtk_ethdr.o \
17+
mtk_gem.o \
1918
mtk_mdp_rdma.o \
20-
mtk_padding.o
19+
mtk_padding.o \
20+
mtk_plane.o
2121

2222
obj-$(CONFIG_DRM_MEDIATEK) += mediatek-drm.o
2323

0 commit comments

Comments
 (0)