Skip to content

Commit 4e8988c

Browse files
jason-jh.linmbgg
jason-jh.lin
authored and
mbgg
committed
soc: mediatek: add DDP_DOMPONENT_DITHER0 enum for mt8195 vdosys0
The mmsys routing table of mt8195 vdosys0 has 2 DITHER components, so mmsys need to add DDP_COMPONENT_DITHER1 and change all usages of DITHER enum form DDP_COMPONENT_DITHER to DDP_COMPONENT_DITHER0. But its header need to keep DDP_COMPONENT_DITHER enum until drm/mediatek also changed it. Signed-off-by: jason-jh.lin <jason-jh.lin@mediatek.com> Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com> Reviewed-by: Rex-BC Chen <rex-bc.chen@mediatek.com> Link: https://lore.kernel.org/r/20220419094143.9561-7-jason-jh.lin@mediatek.com Signed-off-by: Matthias Brugger <matthias.bgg@gmail.com>
1 parent 8fdb61f commit 4e8988c

8 files changed

Lines changed: 18 additions & 17 deletions

File tree

‎drivers/soc/mediatek/mt8167-mmsys.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ static const struct mtk_mmsys_routes mt8167_mmsys_routing_table[] = {
1818
DDP_COMPONENT_OVL0, DDP_COMPONENT_COLOR0,
1919
MT8167_DISP_REG_CONFIG_DISP_OVL0_MOUT_EN, OVL0_MOUT_EN_COLOR0,
2020
}, {
21-
DDP_COMPONENT_DITHER, DDP_COMPONENT_RDMA0,
21+
DDP_COMPONENT_DITHER0, DDP_COMPONENT_RDMA0,
2222
MT8167_DISP_REG_CONFIG_DISP_DITHER_MOUT_EN, MT8167_DITHER_MOUT_EN_RDMA0
2323
}, {
2424
DDP_COMPONENT_OVL0, DDP_COMPONENT_COLOR0,

‎drivers/soc/mediatek/mt8183-mmsys.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ static const struct mtk_mmsys_routes mmsys_mt8183_routing_table[] = {
4141
MT8183_DISP_OVL1_2L_MOUT_EN, MT8183_OVL1_2L_MOUT_EN_RDMA1,
4242
MT8183_OVL1_2L_MOUT_EN_RDMA1
4343
}, {
44-
DDP_COMPONENT_DITHER, DDP_COMPONENT_DSI0,
44+
DDP_COMPONENT_DITHER0, DDP_COMPONENT_DSI0,
4545
MT8183_DISP_DITHER0_MOUT_EN, MT8183_DITHER0_MOUT_IN_DSI0,
4646
MT8183_DITHER0_MOUT_IN_DSI0
4747
}, {

‎drivers/soc/mediatek/mt8186-mmsys.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,12 +76,12 @@ static const struct mtk_mmsys_routes mmsys_mt8186_routing_table[] = {
7676
MT8186_RDMA0_SOUT_TO_COLOR0
7777
},
7878
{
79-
DDP_COMPONENT_DITHER, DDP_COMPONENT_DSI0,
79+
DDP_COMPONENT_DITHER0, DDP_COMPONENT_DSI0,
8080
MT8186_DISP_DITHER0_MOUT_EN, MT8186_DITHER0_MOUT_EN_MASK,
8181
MT8186_DITHER0_MOUT_TO_DSI0,
8282
},
8383
{
84-
DDP_COMPONENT_DITHER, DDP_COMPONENT_DSI0,
84+
DDP_COMPONENT_DITHER0, DDP_COMPONENT_DSI0,
8585
MT8186_DISP_DSI0_SEL_IN, MT8186_DSI0_SEL_IN_MASK,
8686
MT8186_DSI0_FROM_DITHER0
8787
},

‎drivers/soc/mediatek/mt8192-mmsys.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ static const struct mtk_mmsys_routes mmsys_mt8192_routing_table[] = {
4040
MT8192_DISP_OVL2_2L_MOUT_EN, MT8192_OVL2_2L_MOUT_EN_RDMA4,
4141
MT8192_OVL2_2L_MOUT_EN_RDMA4
4242
}, {
43-
DDP_COMPONENT_DITHER, DDP_COMPONENT_DSI0,
43+
DDP_COMPONENT_DITHER0, DDP_COMPONENT_DSI0,
4444
MT8192_DISP_DITHER0_MOUT_EN, MT8192_DITHER0_MOUT_IN_DSI0,
4545
MT8192_DITHER0_MOUT_IN_DSI0
4646
}, {
@@ -52,7 +52,7 @@ static const struct mtk_mmsys_routes mmsys_mt8192_routing_table[] = {
5252
MT8192_DISP_AAL0_SEL_IN, MT8192_AAL0_SEL_IN_CCORR0,
5353
MT8192_AAL0_SEL_IN_CCORR0
5454
}, {
55-
DDP_COMPONENT_DITHER, DDP_COMPONENT_DSI0,
55+
DDP_COMPONENT_DITHER0, DDP_COMPONENT_DSI0,
5656
MT8192_DISP_DSI0_SEL_IN, MT8192_DSI0_SEL_IN_DITHER0,
5757
MT8192_DSI0_SEL_IN_DITHER0
5858
}, {

‎drivers/soc/mediatek/mt8195-mmsys.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ static const struct mtk_mmsys_routes mmsys_mt8195_routing_table[] = {
113113
MT8195_VDO0_SEL_IN, MT8195_SEL_IN_VPP_MERGE_FROM_MASK,
114114
MT8195_SEL_IN_VPP_MERGE_FROM_VDO1_VIRTUAL0
115115
}, {
116-
DDP_COMPONENT_DITHER, DDP_COMPONENT_DSC0,
116+
DDP_COMPONENT_DITHER0, DDP_COMPONENT_DSC0,
117117
MT8195_VDO0_SEL_IN, MT8195_SEL_IN_DSC_WRAP0_IN_FROM_MASK,
118118
MT8195_SEL_IN_DSC_WRAP0_IN_FROM_DISP_DITHER0
119119
}, {
@@ -181,7 +181,7 @@ static const struct mtk_mmsys_routes mmsys_mt8195_routing_table[] = {
181181
MT8195_VDO0_SEL_IN, MT8195_SEL_IN_DSI0_FROM_MASK,
182182
MT8195_SEL_IN_DSI0_FROM_DSC_WRAP0_OUT
183183
}, {
184-
DDP_COMPONENT_DITHER, DDP_COMPONENT_DSI0,
184+
DDP_COMPONENT_DITHER0, DDP_COMPONENT_DSI0,
185185
MT8195_VDO0_SEL_IN, MT8195_SEL_IN_DSI0_FROM_MASK,
186186
MT8195_SEL_IN_DSI0_FROM_DISP_DITHER0
187187
}, {
@@ -245,11 +245,11 @@ static const struct mtk_mmsys_routes mmsys_mt8195_routing_table[] = {
245245
MT8195_VDO0_SEL_IN, MT8195_SEL_IN_DISP_WDMA0_FROM_MASK,
246246
MT8195_SEL_IN_DISP_WDMA0_FROM_DISP_OVL0
247247
}, {
248-
DDP_COMPONENT_DITHER, DDP_COMPONENT_DSC0,
248+
DDP_COMPONENT_DITHER0, DDP_COMPONENT_DSC0,
249249
MT8195_VDO0_SEL_OUT, MT8195_SOUT_DISP_DITHER0_TO_MASK,
250250
MT8195_SOUT_DISP_DITHER0_TO_DSC_WRAP0_IN
251251
}, {
252-
DDP_COMPONENT_DITHER, DDP_COMPONENT_DSI0,
252+
DDP_COMPONENT_DITHER0, DDP_COMPONENT_DSI0,
253253
MT8195_VDO0_SEL_OUT, MT8195_SOUT_DISP_DITHER0_TO_MASK,
254254
MT8195_SOUT_DISP_DITHER0_TO_DSI0
255255
}, {

‎drivers/soc/mediatek/mt8365-mmsys.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,12 @@ static const struct mtk_mmsys_routes mt8365_mmsys_routing_table[] = {
4141
MT8365_DISP_COLOR_SEL_IN_COLOR0,MT8365_DISP_COLOR_SEL_IN_COLOR0
4242
},
4343
{
44-
DDP_COMPONENT_DITHER, DDP_COMPONENT_DSI0,
44+
DDP_COMPONENT_DITHER0, DDP_COMPONENT_DSI0,
4545
MT8365_DISP_REG_CONFIG_DISP_DITHER0_MOUT_EN,
4646
MT8365_DITHER_MOUT_EN_DSI0, MT8365_DITHER_MOUT_EN_DSI0
4747
},
4848
{
49-
DDP_COMPONENT_DITHER, DDP_COMPONENT_DSI0,
49+
DDP_COMPONENT_DITHER0, DDP_COMPONENT_DSI0,
5050
MT8365_DISP_REG_CONFIG_DISP_DSI0_SEL_IN,
5151
MT8365_DSI0_SEL_IN_DITHER, MT8365_DSI0_SEL_IN_DITHER
5252
},

‎drivers/soc/mediatek/mtk-mutex.c‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ static const unsigned int mt8167_mutex_mod[DDP_COMPONENT_ID_MAX] = {
232232
[DDP_COMPONENT_AAL0] = MT8167_MUTEX_MOD_DISP_AAL,
233233
[DDP_COMPONENT_CCORR] = MT8167_MUTEX_MOD_DISP_CCORR,
234234
[DDP_COMPONENT_COLOR0] = MT8167_MUTEX_MOD_DISP_COLOR,
235-
[DDP_COMPONENT_DITHER] = MT8167_MUTEX_MOD_DISP_DITHER,
235+
[DDP_COMPONENT_DITHER0] = MT8167_MUTEX_MOD_DISP_DITHER,
236236
[DDP_COMPONENT_GAMMA] = MT8167_MUTEX_MOD_DISP_GAMMA,
237237
[DDP_COMPONENT_OVL0] = MT8167_MUTEX_MOD_DISP_OVL0,
238238
[DDP_COMPONENT_OVL1] = MT8167_MUTEX_MOD_DISP_OVL1,
@@ -265,7 +265,7 @@ static const unsigned int mt8183_mutex_mod[DDP_COMPONENT_ID_MAX] = {
265265
[DDP_COMPONENT_AAL0] = MT8183_MUTEX_MOD_DISP_AAL0,
266266
[DDP_COMPONENT_CCORR] = MT8183_MUTEX_MOD_DISP_CCORR0,
267267
[DDP_COMPONENT_COLOR0] = MT8183_MUTEX_MOD_DISP_COLOR0,
268-
[DDP_COMPONENT_DITHER] = MT8183_MUTEX_MOD_DISP_DITHER0,
268+
[DDP_COMPONENT_DITHER0] = MT8183_MUTEX_MOD_DISP_DITHER0,
269269
[DDP_COMPONENT_GAMMA] = MT8183_MUTEX_MOD_DISP_GAMMA0,
270270
[DDP_COMPONENT_OVL0] = MT8183_MUTEX_MOD_DISP_OVL0,
271271
[DDP_COMPONENT_OVL_2L0] = MT8183_MUTEX_MOD_DISP_OVL0_2L,
@@ -279,7 +279,7 @@ static const unsigned int mt8186_mutex_mod[DDP_COMPONENT_ID_MAX] = {
279279
[DDP_COMPONENT_AAL0] = MT8186_MUTEX_MOD_DISP_AAL0,
280280
[DDP_COMPONENT_CCORR] = MT8186_MUTEX_MOD_DISP_CCORR0,
281281
[DDP_COMPONENT_COLOR0] = MT8186_MUTEX_MOD_DISP_COLOR0,
282-
[DDP_COMPONENT_DITHER] = MT8186_MUTEX_MOD_DISP_DITHER0,
282+
[DDP_COMPONENT_DITHER0] = MT8186_MUTEX_MOD_DISP_DITHER0,
283283
[DDP_COMPONENT_GAMMA] = MT8186_MUTEX_MOD_DISP_GAMMA0,
284284
[DDP_COMPONENT_OVL0] = MT8186_MUTEX_MOD_DISP_OVL0,
285285
[DDP_COMPONENT_OVL_2L0] = MT8186_MUTEX_MOD_DISP_OVL0_2L,
@@ -292,7 +292,7 @@ static const unsigned int mt8192_mutex_mod[DDP_COMPONENT_ID_MAX] = {
292292
[DDP_COMPONENT_AAL0] = MT8192_MUTEX_MOD_DISP_AAL0,
293293
[DDP_COMPONENT_CCORR] = MT8192_MUTEX_MOD_DISP_CCORR0,
294294
[DDP_COMPONENT_COLOR0] = MT8192_MUTEX_MOD_DISP_COLOR0,
295-
[DDP_COMPONENT_DITHER] = MT8192_MUTEX_MOD_DISP_DITHER0,
295+
[DDP_COMPONENT_DITHER0] = MT8192_MUTEX_MOD_DISP_DITHER0,
296296
[DDP_COMPONENT_GAMMA] = MT8192_MUTEX_MOD_DISP_GAMMA0,
297297
[DDP_COMPONENT_POSTMASK0] = MT8192_MUTEX_MOD_DISP_POSTMASK0,
298298
[DDP_COMPONENT_OVL0] = MT8192_MUTEX_MOD_DISP_OVL0,
@@ -310,7 +310,7 @@ static const unsigned int mt8195_mutex_mod[DDP_COMPONENT_ID_MAX] = {
310310
[DDP_COMPONENT_CCORR] = MT8195_MUTEX_MOD_DISP_CCORR0,
311311
[DDP_COMPONENT_AAL0] = MT8195_MUTEX_MOD_DISP_AAL0,
312312
[DDP_COMPONENT_GAMMA] = MT8195_MUTEX_MOD_DISP_GAMMA0,
313-
[DDP_COMPONENT_DITHER] = MT8195_MUTEX_MOD_DISP_DITHER0,
313+
[DDP_COMPONENT_DITHER0] = MT8195_MUTEX_MOD_DISP_DITHER0,
314314
[DDP_COMPONENT_MERGE0] = MT8195_MUTEX_MOD_DISP_VPP_MERGE,
315315
[DDP_COMPONENT_DSC0] = MT8195_MUTEX_MOD_DISP_DSC_WRAP0_CORE0,
316316
[DDP_COMPONENT_DSI0] = MT8195_MUTEX_MOD_DISP_DSI0,

‎include/linux/soc/mediatek/mtk-mmsys.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ enum mtk_ddp_comp_id {
1717
DDP_COMPONENT_COLOR0,
1818
DDP_COMPONENT_COLOR1,
1919
DDP_COMPONENT_DITHER,
20+
DDP_COMPONENT_DITHER0 = DDP_COMPONENT_DITHER,
2021
DDP_COMPONENT_DITHER1,
2122
DDP_COMPONENT_DP_INTF0,
2223
DDP_COMPONENT_DP_INTF1,

0 commit comments

Comments
 (0)