Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit df2dce4e authored by stu.hsieh@mediatek.com's avatar stu.hsieh@mediatek.com Committed by CK Hu
Browse files

drm/mediatek: add ddp component OD1 



This patch add the component OD1 and
rename the OD to OD0

Signed-off-by: default avatarStu Hsieh <stu.hsieh@mediatek.com>
Signed-off-by: default avatarCK Hu <ck.hu@mediatek.com>
parent d480bbc4

drivers/gpu/drm/mediatek/mtk_drm_ddp.c

+2 −2
Original line number Diff line number Diff line
@@ -114,7 +114,7 @@ static const unsigned int mt8173_mutex_mod[DDP_COMPONENT_ID_MAX] = { 
	[DDP_COMPONENT_COLOR0] = MT8173_MUTEX_MOD_DISP_COLOR0,

	[DDP_COMPONENT_COLOR1] = MT8173_MUTEX_MOD_DISP_COLOR1,

	[DDP_COMPONENT_GAMMA] = MT8173_MUTEX_MOD_DISP_GAMMA,

	[DDP_COMPONENT_OD] = MT8173_MUTEX_MOD_DISP_OD,

	[DDP_COMPONENT_OD0] = MT8173_MUTEX_MOD_DISP_OD,

	[DDP_COMPONENT_OVL0] = MT8173_MUTEX_MOD_DISP_OVL0,

	[DDP_COMPONENT_OVL1] = MT8173_MUTEX_MOD_DISP_OVL1,

	[DDP_COMPONENT_PWM0] = MT8173_MUTEX_MOD_DISP_PWM0,
@@ -139,7 +139,7 @@ static unsigned int mtk_ddp_mout_en(enum mtk_ddp_comp_id cur, 
	} else if (cur == DDP_COMPONENT_OVL0 && next == DDP_COMPONENT_RDMA0) {

		*addr = DISP_REG_CONFIG_DISP_OVL_MOUT_EN;

		value = OVL_MOUT_EN_RDMA;

	} else if (cur == DDP_COMPONENT_OD && next == DDP_COMPONENT_RDMA0) {

	} else if (cur == DDP_COMPONENT_OD0 && next == DDP_COMPONENT_RDMA0) {

		*addr = DISP_REG_CONFIG_DISP_OD_MOUT_EN;

		value = OD_MOUT_EN_RDMA0;

	} else if (cur == DDP_COMPONENT_UFOE && next == DDP_COMPONENT_DSI0) {

drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c

+2 −1
Original line number Diff line number Diff line
@@ -227,7 +227,8 @@ static const struct mtk_ddp_comp_match mtk_ddp_matches[DDP_COMPONENT_ID_MAX] = { 
	[DDP_COMPONENT_DSI0]	= { MTK_DSI,		0, NULL },

	[DDP_COMPONENT_DSI1]	= { MTK_DSI,		1, NULL },

	[DDP_COMPONENT_GAMMA]	= { MTK_DISP_GAMMA,	0, &ddp_gamma },

	[DDP_COMPONENT_OD]	= { MTK_DISP_OD,	0, &ddp_od },

	[DDP_COMPONENT_OD0]	= { MTK_DISP_OD,	0, &ddp_od },

	[DDP_COMPONENT_OD1]	= { MTK_DISP_OD,	1, &ddp_od },

	[DDP_COMPONENT_OVL0]	= { MTK_DISP_OVL,	0, NULL },

	[DDP_COMPONENT_OVL1]	= { MTK_DISP_OVL,	1, NULL },

	[DDP_COMPONENT_PWM0]	= { MTK_DISP_PWM,	0, NULL },

drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h

+2 −1
Original line number Diff line number Diff line
@@ -50,7 +50,8 @@ enum mtk_ddp_comp_id { 
	DDP_COMPONENT_DSI0,

	DDP_COMPONENT_DSI1,

	DDP_COMPONENT_GAMMA,

	DDP_COMPONENT_OD,

	DDP_COMPONENT_OD0,

	DDP_COMPONENT_OD1,

	DDP_COMPONENT_OVL0,

	DDP_COMPONENT_OVL1,

	DDP_COMPONENT_PWM0,

drivers/gpu/drm/mediatek/mtk_drm_drv.c

+1 −1
Original line number Diff line number Diff line
@@ -150,7 +150,7 @@ static const enum mtk_ddp_comp_id mt8173_mtk_ddp_main[] = { 
	DDP_COMPONENT_OVL0,

	DDP_COMPONENT_COLOR0,

	DDP_COMPONENT_AAL0,

	DDP_COMPONENT_OD,

	DDP_COMPONENT_OD0,

	DDP_COMPONENT_RDMA0,

	DDP_COMPONENT_UFOE,

	DDP_COMPONENT_DSI0,