Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

soc: mediatek: mt8365-mmsys: Fix routing table masks and values

The mmsys driver reads the routing table and writes to the
hardware `val & mask`, but multiple entries in the mmsys
routing table for the MT8365 SoC are setting a 0x0 mask:
this effectively writes .. nothing .. to the hardware.

That would never work, and if the display controller was
actually working with the mmsys doing no routing at all,
that was only because the bootloader was correctly setting
the display controller routing registers before booting the
kernel, and the mmsys was never reset.

Make this table to actually set the routing by adding the
correct register masks to it.

While at it, also change MOUT val definitions to BIT(x), as
the MOUT registers are effectively checking for each bit to
enable output to the corresponding HW.
Please note that, for this SoC, only the MOUT registers are
checking bits (as those can enable multiple outputs), while
the others are purely reading a number to select an input.

Fixes: bc3fc5c05100 ("soc: mediatek: mmsys: add MT8365 support")
Link: https://lore.kernel.org/r/20250212100012.33001-7-angelogioacchino.delregno@collabora.com
Signed-off-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>

+20 -28
+20 -28
drivers/soc/mediatek/mt8365-mmsys.h
··· 14 14 #define MT8365_DISP_REG_CONFIG_DISP_DPI0_SEL_IN 0xfd8 15 15 #define MT8365_DISP_REG_CONFIG_DISP_LVDS_SYS_CFG_00 0xfdc 16 16 17 + #define MT8365_DISP_MS_IN_OUT_MASK GENMASK(3, 0) 17 18 #define MT8365_RDMA0_SOUT_COLOR0 0x1 18 - #define MT8365_DITHER_MOUT_EN_DSI0 0x1 19 + #define MT8365_DITHER_MOUT_EN_DSI0 BIT(0) 19 20 #define MT8365_DSI0_SEL_IN_DITHER 0x1 20 21 #define MT8365_RDMA0_SEL_IN_OVL0 0x0 21 22 #define MT8365_RDMA0_RSZ0_SEL_IN_RDMA0 0x0 ··· 31 30 { 32 31 DDP_COMPONENT_OVL0, DDP_COMPONENT_RDMA0, 33 32 MT8365_DISP_REG_CONFIG_DISP_OVL0_MOUT_EN, 34 - MT8365_OVL0_MOUT_PATH0_SEL, MT8365_OVL0_MOUT_PATH0_SEL 35 - }, 36 - { 33 + MT8365_DISP_MS_IN_OUT_MASK, MT8365_OVL0_MOUT_PATH0_SEL 34 + }, { 37 35 DDP_COMPONENT_OVL0, DDP_COMPONENT_RDMA0, 38 36 MT8365_DISP_REG_CONFIG_DISP_RDMA0_SEL_IN, 39 - MT8365_RDMA0_SEL_IN_OVL0, MT8365_RDMA0_SEL_IN_OVL0 40 - }, 41 - { 37 + MT8365_DISP_MS_IN_OUT_MASK, MT8365_RDMA0_SEL_IN_OVL0 38 + }, { 42 39 DDP_COMPONENT_RDMA0, DDP_COMPONENT_COLOR0, 43 40 MT8365_DISP_REG_CONFIG_DISP_RDMA0_SOUT_SEL, 44 - MT8365_RDMA0_SOUT_COLOR0, MT8365_RDMA0_SOUT_COLOR0 45 - }, 46 - { 41 + MT8365_DISP_MS_IN_OUT_MASK, MT8365_RDMA0_SOUT_COLOR0 42 + }, { 47 43 DDP_COMPONENT_COLOR0, DDP_COMPONENT_CCORR, 48 44 MT8365_DISP_REG_CONFIG_DISP_COLOR0_SEL_IN, 49 - MT8365_DISP_COLOR_SEL_IN_COLOR0,MT8365_DISP_COLOR_SEL_IN_COLOR0 50 - }, 51 - { 45 + MT8365_DISP_MS_IN_OUT_MASK, MT8365_DISP_COLOR_SEL_IN_COLOR0 46 + }, { 52 47 DDP_COMPONENT_DITHER0, DDP_COMPONENT_DSI0, 53 48 MT8365_DISP_REG_CONFIG_DISP_DITHER0_MOUT_EN, 54 - MT8365_DITHER_MOUT_EN_DSI0, MT8365_DITHER_MOUT_EN_DSI0 55 - }, 56 - { 49 + MT8365_DISP_MS_IN_OUT_MASK, MT8365_DITHER_MOUT_EN_DSI0 50 + }, { 57 51 DDP_COMPONENT_DITHER0, DDP_COMPONENT_DSI0, 58 52 MT8365_DISP_REG_CONFIG_DISP_DSI0_SEL_IN, 59 - MT8365_DSI0_SEL_IN_DITHER, MT8365_DSI0_SEL_IN_DITHER 60 - }, 61 - { 53 + MT8365_DISP_MS_IN_OUT_MASK, MT8365_DSI0_SEL_IN_DITHER 54 + }, { 62 55 DDP_COMPONENT_RDMA0, DDP_COMPONENT_COLOR0, 63 56 MT8365_DISP_REG_CONFIG_DISP_RDMA0_RSZ0_SEL_IN, 64 - MT8365_RDMA0_RSZ0_SEL_IN_RDMA0, MT8365_RDMA0_RSZ0_SEL_IN_RDMA0 65 - }, 66 - { 57 + MT8365_DISP_MS_IN_OUT_MASK, MT8365_RDMA0_RSZ0_SEL_IN_RDMA0 58 + }, { 67 59 DDP_COMPONENT_RDMA1, DDP_COMPONENT_DPI0, 68 60 MT8365_DISP_REG_CONFIG_DISP_LVDS_SYS_CFG_00, 69 61 MT8365_LVDS_SYS_CFG_00_SEL_LVDS_PXL_CLK, MT8365_LVDS_SYS_CFG_00_SEL_LVDS_PXL_CLK 70 - }, 71 - { 62 + }, { 72 63 DDP_COMPONENT_RDMA1, DDP_COMPONENT_DPI0, 73 64 MT8365_DISP_REG_CONFIG_DISP_DPI0_SEL_IN, 74 - MT8365_DPI0_SEL_IN_RDMA1, MT8365_DPI0_SEL_IN_RDMA1 75 - }, 76 - { 65 + MT8365_DISP_MS_IN_OUT_MASK, MT8365_DPI0_SEL_IN_RDMA1 66 + }, { 77 67 DDP_COMPONENT_RDMA1, DDP_COMPONENT_DPI0, 78 68 MT8365_DISP_REG_CONFIG_DISP_RDMA1_SOUT_SEL, 79 - MT8365_RDMA1_SOUT_DPI0, MT8365_RDMA1_SOUT_DPI0 69 + MT8365_DISP_MS_IN_OUT_MASK, MT8365_RDMA1_SOUT_DPI0 80 70 }, 81 71 }; 82 72