summaryrefslogtreecommitdiff
path: root/drivers/gpu/drm/mediatek/mtk_drm_drv.h
diff options
context:
space:
mode:
authorjason-jh.lin <jason-jh.lin@mediatek.com>2022-05-26 18:21:23 +0800
committerChun-Kuang Hu <chunkuang.hu@kernel.org>2022-06-06 21:16:02 +0800
commitbd448b8867b7e0c30ecd09f944a86018596fa4ad (patch)
tree68d23e6eb8bb8b06472d47f105252b222e8c4153 /drivers/gpu/drm/mediatek/mtk_drm_drv.h
parentb7fb767b1658b3154da712844cf834c5d66ddb2b (diff)
drm/mediatek: Add MERGE support for mediatek-drm
Add MERGE engine file: MERGE module is used to merge two slice-per-line inputs into one side-by-side output. Link: https://patchwork.kernel.org/project/linux-mediatek/patch/20220526102126.19756-3-jason-jh.lin@mediatek.com/ Signed-off-by: jason-jh.lin <jason-jh.lin@mediatek.com> Acked-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com> Signed-off-by: Chun-Kuang Hu <chunkuang.hu@kernel.org>
Diffstat (limited to 'drivers/gpu/drm/mediatek/mtk_drm_drv.h')
-rw-r--r--drivers/gpu/drm/mediatek/mtk_drm_drv.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/mediatek/mtk_drm_drv.h b/drivers/gpu/drm/mediatek/mtk_drm_drv.h
index 3e7d1e6fbe01..a58cebd01d35 100644
--- a/drivers/gpu/drm/mediatek/mtk_drm_drv.h
+++ b/drivers/gpu/drm/mediatek/mtk_drm_drv.h
@@ -50,6 +50,7 @@ extern struct platform_driver mtk_disp_aal_driver;
extern struct platform_driver mtk_disp_ccorr_driver;
extern struct platform_driver mtk_disp_color_driver;
extern struct platform_driver mtk_disp_gamma_driver;
+extern struct platform_driver mtk_disp_merge_driver;
extern struct platform_driver mtk_disp_ovl_driver;
extern struct platform_driver mtk_disp_rdma_driver;
extern struct platform_driver mtk_dpi_driver;