Commit 9c1b06a5 authored by jason-jh.lin's avatar jason-jh.lin Committed by Chun-Kuang Hu
Browse files

drm/mediatek: Add suffix 0 to DDP_COMPONENT_DITHER for mt8195 vdosys0 

Because mt8195 vdosys0 has 2 DITHER components,
so the suffix 0 need to be added to DDP_COMPONENT_DITHER.

Then DITHER enum will become:
DDP_COMPONENT_DITHER0 and DDP_COMPONENT_DITHER1.

Link: https://patchwork.kernel.org/project/linux-mediatek/patch/20220526102126.19756-5-jason-jh.lin@mediatek.com/


Signed-off-by: default avatarjason-jh.lin <jason-jh.lin@mediatek.com>
Reviewed-by: default avatarAngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Reviewed-by: default avatarRex-BC Chen <rex-bc.chen@mediatek.com>
Signed-off-by: default avatarChun-Kuang Hu <chunkuang.hu@kernel.org>
parent 7266e90a

drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c

+1 −1
Original line number Diff line number Diff line
@@ -424,7 +424,7 @@ static const struct mtk_ddp_comp_match mtk_ddp_matches[DDP_COMPONENT_ID_MAX] = { 
	[DDP_COMPONENT_CCORR]		= { MTK_DISP_CCORR,	0, &ddp_ccorr },

	[DDP_COMPONENT_COLOR0]		= { MTK_DISP_COLOR,	0, &ddp_color },

	[DDP_COMPONENT_COLOR1]		= { MTK_DISP_COLOR,	1, &ddp_color },

	[DDP_COMPONENT_DITHER]		= { MTK_DISP_DITHER,	0, &ddp_dither },

	[DDP_COMPONENT_DITHER0]		= { MTK_DISP_DITHER,	0, &ddp_dither },

	[DDP_COMPONENT_DPI0]		= { MTK_DPI,		0, &ddp_dpi },

	[DDP_COMPONENT_DPI1]		= { MTK_DPI,		1, &ddp_dpi },

	[DDP_COMPONENT_DSC0]		= { MTK_DISP_DSC,	0, &ddp_dsc },

drivers/gpu/drm/mediatek/mtk_drm_drv.c

+5 −5
Original line number Diff line number Diff line
@@ -118,7 +118,7 @@ static enum mtk_ddp_comp_id mt8167_mtk_ddp_main[] = { 
	DDP_COMPONENT_CCORR,

	DDP_COMPONENT_AAL0,

	DDP_COMPONENT_GAMMA,

	DDP_COMPONENT_DITHER,

	DDP_COMPONENT_DITHER0,

	DDP_COMPONENT_RDMA0,

	DDP_COMPONENT_DSI0,

};
@@ -150,7 +150,7 @@ static const enum mtk_ddp_comp_id mt8183_mtk_ddp_main[] = { 
	DDP_COMPONENT_CCORR,

	DDP_COMPONENT_AAL0,

	DDP_COMPONENT_GAMMA,

	DDP_COMPONENT_DITHER,

	DDP_COMPONENT_DITHER0,

	DDP_COMPONENT_DSI0,

};
@@ -168,7 +168,7 @@ static const enum mtk_ddp_comp_id mt8186_mtk_ddp_main[] = { 
	DDP_COMPONENT_AAL0,

	DDP_COMPONENT_GAMMA,

	DDP_COMPONENT_POSTMASK0,

	DDP_COMPONENT_DITHER,

	DDP_COMPONENT_DITHER0,

	DDP_COMPONENT_DSI0,

};
@@ -187,7 +187,7 @@ static const enum mtk_ddp_comp_id mt8192_mtk_ddp_main[] = { 
	DDP_COMPONENT_AAL0,

	DDP_COMPONENT_GAMMA,

	DDP_COMPONENT_POSTMASK0,

	DDP_COMPONENT_DITHER,

	DDP_COMPONENT_DITHER0,

	DDP_COMPONENT_DSI0,

};
@@ -204,7 +204,7 @@ static const enum mtk_ddp_comp_id mt8195_mtk_ddp_main[] = { 
	DDP_COMPONENT_CCORR,

	DDP_COMPONENT_AAL0,

	DDP_COMPONENT_GAMMA,

	DDP_COMPONENT_DITHER,

	DDP_COMPONENT_DITHER0,

	DDP_COMPONENT_DSC0,

	DDP_COMPONENT_MERGE0,

	DDP_COMPONENT_DP_INTF0,