Re: [PATCH] soc: mediatek: mtk-mmsys: Restore MT8167 routing masks lost during merge

[AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>]

Il 06/02/26 13:26, Luca Leonardo Scorcia ha scritto:
> The original patch at
> https://lore.kernel.org/all/20201027160631.608503-2-fparent@baylibre.com/
> included the values for the route masks, but they got lost during merge.
> 
> Fixes: 060f7875bd23 ("soc: mediatek: mmsys: Add support for MT8167 SoC")
> 
> Signed-off-by: Luca Leonardo Scorcia <l.scorcia@gmail.com>

Hello Luca,
thanks for this patch!

I agree that the masks should be corrected, and I think the code itself is all
good stuff. Great job!

However, the commit description needs to be fixed; please, don't add links, as
those are meaningful now, but may not work in some years from now.

Something like:
"The original patch that got sent to the mailing lists included the values for
the route masks, but they got lost during merge: add back the full register
masks where missing"

...the Fixes tag is good.

Cheers,
Angelo

> ---
>   drivers/soc/mediatek/mt8167-mmsys.h | 11 ++++++++---
>   1 file changed, 8 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/soc/mediatek/mt8167-mmsys.h b/drivers/soc/mediatek/mt8167-mmsys.h
> index c468926561b4..eef14083c47b 100644
> --- a/drivers/soc/mediatek/mt8167-mmsys.h
> +++ b/drivers/soc/mediatek/mt8167-mmsys.h
> @@ -10,24 +10,29 @@
>   #define MT8167_DISP_REG_CONFIG_DISP_RDMA0_SOUT_SEL_IN	0x06c
>   
>   #define MT8167_DITHER_MOUT_EN_RDMA0			0x1
> +#define MT8167_DITHER_MOUT_EN_MASK			0x7
> +
>   #define MT8167_RDMA0_SOUT_DSI0				0x2
> +#define MT8167_RDMA0_SOUT_MASK				0x3
> +
>   #define MT8167_DSI0_SEL_IN_RDMA0			0x1
> +#define MT8167_DSI0_SEL_IN_MASK				0x3
>   
>   static const struct mtk_mmsys_routes mt8167_mmsys_routing_table[] = {
>   	MMSYS_ROUTE(OVL0, COLOR0,
>   		    MT8167_DISP_REG_CONFIG_DISP_OVL0_MOUT_EN, OVL0_MOUT_EN_COLOR0,
>   		    OVL0_MOUT_EN_COLOR0),
>   	MMSYS_ROUTE(DITHER0, RDMA0,
> -		    MT8167_DISP_REG_CONFIG_DISP_DITHER_MOUT_EN, MT8167_DITHER_MOUT_EN_RDMA0,
> +		    MT8167_DISP_REG_CONFIG_DISP_DITHER_MOUT_EN, MT8167_DITHER_MOUT_EN_MASK,
>   		    MT8167_DITHER_MOUT_EN_RDMA0),
>   	MMSYS_ROUTE(OVL0, COLOR0,
>   		    MT8167_DISP_REG_CONFIG_DISP_COLOR0_SEL_IN, COLOR0_SEL_IN_OVL0,
>   		    COLOR0_SEL_IN_OVL0),
>   	MMSYS_ROUTE(RDMA0, DSI0,
> -		    MT8167_DISP_REG_CONFIG_DISP_DSI0_SEL_IN, MT8167_DSI0_SEL_IN_RDMA0,
> +		    MT8167_DISP_REG_CONFIG_DISP_DSI0_SEL_IN, MT8167_DSI0_SEL_IN_MASK,
>   		    MT8167_DSI0_SEL_IN_RDMA0),
>   	MMSYS_ROUTE(RDMA0, DSI0,
> -		    MT8167_DISP_REG_CONFIG_DISP_RDMA0_SOUT_SEL_IN, MT8167_RDMA0_SOUT_DSI0,
> +		    MT8167_DISP_REG_CONFIG_DISP_RDMA0_SOUT_SEL_IN, MT8167_RDMA0_SOUT_MASK,
>   		    MT8167_RDMA0_SOUT_DSI0),
>   };
>