mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-12 03:26:26 +00:00
c432cd598a
In commitd687e056a1("soc: mediatek: mmsys: Add mt8192 mmsys routing table"), the mmsys routing table for mt8192 was introduced but the input selector for DITHER->DSI0 has no value assigned to it. This means that we are clearing bit 0 instead of setting it, blocking communication between these two blocks; due to that, any display that is connected to DSI0 will not work, as no data will go through. The effect of that issue is that, during bootup, the DRM will block for some time, while atomically waiting for a vblank that never happens; later, the situation doesn't get better, leaving the display in a non-functional state. To fix this issue, fix the route entry in the table by assigning the dither input selector to MT8192_DISP_DSI0_SEL_IN. Fixes:d687e056a1("soc: mediatek: mmsys: Add mt8192 mmsys routing table") Signed-off-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com> Tested-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com> Reviewed-by: Nícolas F. R. A. Prado <nfraprado@collabora.com> Link: https://lore.kernel.org/r/20220128142056.359900-1-angelogioacchino.delregno@collabora.com Signed-off-by: Matthias Brugger <matthias.bgg@gmail.com>
77 lines
2.6 KiB
C
77 lines
2.6 KiB
C
/* SPDX-License-Identifier: GPL-2.0-only */
|
|
|
|
#ifndef __SOC_MEDIATEK_MT8192_MMSYS_H
|
|
#define __SOC_MEDIATEK_MT8192_MMSYS_H
|
|
|
|
#define MT8192_MMSYS_OVL_MOUT_EN 0xf04
|
|
#define MT8192_DISP_OVL1_2L_MOUT_EN 0xf08
|
|
#define MT8192_DISP_OVL0_2L_MOUT_EN 0xf18
|
|
#define MT8192_DISP_OVL0_MOUT_EN 0xf1c
|
|
#define MT8192_DISP_RDMA0_SEL_IN 0xf2c
|
|
#define MT8192_DISP_RDMA0_SOUT_SEL 0xf30
|
|
#define MT8192_DISP_CCORR0_SOUT_SEL 0xf34
|
|
#define MT8192_DISP_AAL0_SEL_IN 0xf38
|
|
#define MT8192_DISP_DITHER0_MOUT_EN 0xf3c
|
|
#define MT8192_DISP_DSI0_SEL_IN 0xf40
|
|
#define MT8192_DISP_OVL2_2L_MOUT_EN 0xf4c
|
|
|
|
#define MT8192_DISP_OVL0_GO_BLEND BIT(0)
|
|
#define MT8192_DITHER0_MOUT_IN_DSI0 BIT(0)
|
|
#define MT8192_OVL0_MOUT_EN_DISP_RDMA0 BIT(0)
|
|
#define MT8192_OVL2_2L_MOUT_EN_RDMA4 BIT(0)
|
|
#define MT8192_DISP_OVL0_GO_BG BIT(1)
|
|
#define MT8192_DISP_OVL0_2L_GO_BLEND BIT(2)
|
|
#define MT8192_DISP_OVL0_2L_GO_BG BIT(3)
|
|
#define MT8192_OVL1_2L_MOUT_EN_RDMA1 BIT(4)
|
|
#define MT8192_OVL0_MOUT_EN_OVL0_2L BIT(4)
|
|
#define MT8192_RDMA0_SEL_IN_OVL0_2L 0x3
|
|
#define MT8192_RDMA0_SOUT_COLOR0 0x1
|
|
#define MT8192_CCORR0_SOUT_AAL0 0x1
|
|
#define MT8192_AAL0_SEL_IN_CCORR0 0x1
|
|
#define MT8192_DSI0_SEL_IN_DITHER0 0x1
|
|
|
|
static const struct mtk_mmsys_routes mmsys_mt8192_routing_table[] = {
|
|
{
|
|
DDP_COMPONENT_OVL_2L0, DDP_COMPONENT_RDMA0,
|
|
MT8192_DISP_OVL0_2L_MOUT_EN, MT8192_OVL0_MOUT_EN_DISP_RDMA0,
|
|
MT8192_OVL0_MOUT_EN_DISP_RDMA0
|
|
}, {
|
|
DDP_COMPONENT_OVL_2L2, DDP_COMPONENT_RDMA4,
|
|
MT8192_DISP_OVL2_2L_MOUT_EN, MT8192_OVL2_2L_MOUT_EN_RDMA4,
|
|
MT8192_OVL2_2L_MOUT_EN_RDMA4
|
|
}, {
|
|
DDP_COMPONENT_DITHER, DDP_COMPONENT_DSI0,
|
|
MT8192_DISP_DITHER0_MOUT_EN, MT8192_DITHER0_MOUT_IN_DSI0,
|
|
MT8192_DITHER0_MOUT_IN_DSI0
|
|
}, {
|
|
DDP_COMPONENT_OVL_2L0, DDP_COMPONENT_RDMA0,
|
|
MT8192_DISP_RDMA0_SEL_IN, MT8192_RDMA0_SEL_IN_OVL0_2L,
|
|
MT8192_RDMA0_SEL_IN_OVL0_2L
|
|
}, {
|
|
DDP_COMPONENT_CCORR, DDP_COMPONENT_AAL0,
|
|
MT8192_DISP_AAL0_SEL_IN, MT8192_AAL0_SEL_IN_CCORR0,
|
|
MT8192_AAL0_SEL_IN_CCORR0
|
|
}, {
|
|
DDP_COMPONENT_DITHER, DDP_COMPONENT_DSI0,
|
|
MT8192_DISP_DSI0_SEL_IN, MT8192_DSI0_SEL_IN_DITHER0,
|
|
MT8192_DSI0_SEL_IN_DITHER0
|
|
}, {
|
|
DDP_COMPONENT_RDMA0, DDP_COMPONENT_COLOR0,
|
|
MT8192_DISP_RDMA0_SOUT_SEL, MT8192_RDMA0_SOUT_COLOR0,
|
|
MT8192_RDMA0_SOUT_COLOR0
|
|
}, {
|
|
DDP_COMPONENT_CCORR, DDP_COMPONENT_AAL0,
|
|
MT8192_DISP_CCORR0_SOUT_SEL, MT8192_CCORR0_SOUT_AAL0,
|
|
MT8192_CCORR0_SOUT_AAL0
|
|
}, {
|
|
DDP_COMPONENT_OVL0, DDP_COMPONENT_OVL_2L0,
|
|
MT8192_MMSYS_OVL_MOUT_EN, MT8192_DISP_OVL0_GO_BG,
|
|
MT8192_DISP_OVL0_GO_BG
|
|
}, {
|
|
DDP_COMPONENT_OVL_2L0, DDP_COMPONENT_RDMA0,
|
|
MT8192_MMSYS_OVL_MOUT_EN, MT8192_DISP_OVL0_2L_GO_BLEND,
|
|
MT8192_DISP_OVL0_2L_GO_BLEND
|
|
}
|
|
};
|
|
|
|
#endif /* __SOC_MEDIATEK_MT8192_MMSYS_H */
|