diff options
| author | jason-jh.lin <jason-jh.lin@mediatek.com> | 2022-05-26 18:21:23 +0800 |
|---|---|---|
| committer | Chun-Kuang Hu <chunkuang.hu@kernel.org> | 2022-06-06 21:16:02 +0800 |
| commit | bd448b8867b7e0c30ecd09f944a86018596fa4ad (patch) | |
| tree | 68d23e6eb8bb8b06472d47f105252b222e8c4153 /drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h | |
| parent | b7fb767b1658b3154da712844cf834c5d66ddb2b (diff) | |
| download | linux-stable-bd448b8867b7e0c30ecd09f944a86018596fa4ad.tar.gz linux-stable-bd448b8867b7e0c30ecd09f944a86018596fa4ad.tar.bz2 linux-stable-bd448b8867b7e0c30ecd09f944a86018596fa4ad.zip | |
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_ddp_comp.h')
| -rw-r--r-- | drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h index 238776bd3b72..a43d82c12a9a 100644 --- a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h +++ b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h @@ -25,6 +25,7 @@ enum mtk_ddp_comp_type { MTK_DISP_DITHER, MTK_DISP_DSC, MTK_DISP_GAMMA, + MTK_DISP_MERGE, MTK_DISP_MUTEX, MTK_DISP_OD, MTK_DISP_OVL, |