Thank you for saying that. Will do more in the future. I found two typos in the description. Will fix them in the next version as well. (ETDHR -> ETHDR, VSNYC -> VSYNC) On Wed, 2023-06-14 at 13:21 +0200, AngeloGioacchino Del Regno wrote: > > External email : Please do not click links or open attachments until > you have verified the sender or the content. > Il 14/06/23 09:31, Hsiao Chien Sung ha scritto: > > - Add register definitions for MT8188 > > - Add VDOSYS1 routing table > > - Update MUTEX definitions accordingly > > - Set VSYNC length from 0x40 (default) to 1 since ETHDR is bypassed > > > > Signed-off-by: Hsiao Chien Sung <shawn.sung@xxxxxxxxxxxx> > > I love that you added documentation to struct mtk_mmsys_driver_data. > Good job! > > Reviewed-by: AngeloGioacchino Del Regno < > angelogioacchino.delregno@xxxxxxxxxxxxx> > > > --- > > drivers/soc/mediatek/mt8188-mmsys.h | 127 > ++++++++++++++++++++++++++++ > > drivers/soc/mediatek/mtk-mmsys.c | 13 +++ > > drivers/soc/mediatek/mtk-mmsys.h | 29 +++++++ > > drivers/soc/mediatek/mtk-mutex.c | 35 ++++++++ > > 4 files changed, 204 insertions(+) > > > > diff --git a/drivers/soc/mediatek/mt8188-mmsys.h > b/drivers/soc/mediatek/mt8188-mmsys.h > > index 448cc3761b43..447afb72d95f 100644 > > --- a/drivers/soc/mediatek/mt8188-mmsys.h > > +++ b/drivers/soc/mediatek/mt8188-mmsys.h > > @@ -67,6 +67,57 @@ > > #define MT8188_SOUT_DSC_WRAP0_OUT_TO_VPP_MERGEBIT(18) > > #define MT8188_SOUT_DSC_WRAP0_OUT_TO_DISP_WDMA0BIT(19) > > > > +#define MT8188_VDO1_SW0_RST_B0x1d0 > > +#define MT8188_VDO1_HDR_TOP_CFG0xd00 > > +#define MT8188_VDO1_MIXER_IN1_ALPHA0xd30 > > +#define MT8188_VDO1_MIXER_IN1_PAD0xd40 > > +#define MT8188_VDO1_MERGE0_ASYNC_CFG_WD0xe30 > > +#define MT8188_VDO1_HDRBE_ASYNC_CFG_WD0xe70 > > +#define MT8188_VDO1_VPP_MERGE0_P0_SEL_IN0xf04 > > +#define MT8188_VPP_MERGE0_P0_SEL_IN_FROM_MDP_RDMA01 > > +#define MT8188_VDO1_VPP_MERGE0_P1_SEL_IN0xf08 > > +#define MT8188_VPP_MERGE0_P1_SEL_IN_FROM_MDP_RDMA11 > > +#define MT8188_VDO1_DISP_DPI1_SEL_IN0xf10 > > +#define MT8188_DISP_DPI1_SEL_IN_FROM_VPP_MERGE4_MOUT0 > > +#define MT8188_VDO1_DISP_DP_INTF0_SEL_IN0xf14 > > +#define MT8188_DISP_DP_INTF0_SEL_IN_FROM_VPP_MERGE4_MOUT0 > > +#define MT8188_VDO1_MERGE4_SOUT_SEL0xf18 > > +#define MT8188_MERGE4_SOUT_TO_DPI1_SELBIT(2) > > +#define MT8188_MERGE4_SOUT_TO_DP_INTF0_SELBIT(3) > > +#define MT8188_VDO1_MIXER_IN1_SEL_IN0xf24 > > +#define MT8188_MIXER_IN1_SEL_IN_FROM_MERGE0_ASYNC_SOUT1 > > +#define MT8188_VDO1_MIXER_IN2_SEL_IN0xf28 > > +#define MT8188_MIXER_IN2_SEL_IN_FROM_MERGE1_ASYNC_SOUT1 > > +#define MT8188_VDO1_MIXER_IN3_SEL_IN0xf2c > > +#define MT8188_MIXER_IN3_SEL_IN_FROM_MERGE2_ASYNC_SOUT1 > > +#define MT8188_VDO1_MIXER_IN4_SEL_IN0xf30 > > +#define MT8188_MIXER_IN4_SEL_IN_FROM_MERGE3_ASYNC_SOUT1 > > +#define MT8188_VDO1_MIXER_OUT_SOUT_SEL0xf34 > > +#define MT8188_MIXER_SOUT_TO_MERGE4_ASYNC_SEL1 > > +#define MT8188_VDO1_VPP_MERGE1_P0_SEL_IN0xf3c > > +#define MT8188_VPP_MERGE1_P0_SEL_IN_FROM_MDP_RDMA21 > > +#define MT8188_VDO1_MERGE0_ASYNC_SOUT_SEL0xf40 > > +#define MT8188_SOUT_TO_MIXER_IN1_SEL1 > > +#define MT8188_VDO1_MERGE1_ASYNC_SOUT_SEL0xf44 > > +#define MT8188_SOUT_TO_MIXER_IN2_SEL1 > > +#define MT8188_VDO1_MERGE2_ASYNC_SOUT_SEL0xf48 > > +#define MT8188_SOUT_TO_MIXER_IN3_SEL1 > > +#define MT8188_VDO1_MERGE3_ASYNC_SOUT_SEL0xf4c > > +#define MT8188_SOUT_TO_MIXER_IN4_SEL1 > > +#define MT8188_VDO1_MERGE4_ASYNC_SEL_IN0xf50 > > +#define MT8188_MERGE4_ASYNC_SEL_IN_FROM_MIXER_OUT_SOUT1 > > +#define MT8188_VDO1_MIXER_IN1_SOUT_SEL0xf58 > > +#define MT8188_MIXER_IN1_SOUT_TO_DISP_MIXER0 > > +#define MT8188_VDO1_MIXER_IN2_SOUT_SEL0xf5c > > +#define MT8188_MIXER_IN2_SOUT_TO_DISP_MIXER0 > > +#define MT8188_VDO1_MIXER_IN3_SOUT_SEL0xf60 > > +#define MT8188_MIXER_IN3_SOUT_TO_DISP_MIXER0 > > +#define MT8188_VDO1_MIXER_IN4_SOUT_SEL0xf64 > > +#define MT8188_MIXER_IN4_SOUT_TO_DISP_MIXER0 > > +#define MT8188_VDO1_MIXER_SOUT_SEL_IN0xf68 > > +#define MT8188_MIXER_SOUT_SEL_IN_FROM_DISP_MIXER0 > > +#define MT8188_VDO1_MIXER_VSYNC_LEN0xd5c > > + > > static const struct mtk_mmsys_routes mmsys_mt8188_routing_table[] > = { > > { > > DDP_COMPONENT_OVL0, DDP_COMPONENT_RDMA0, > > @@ -146,4 +197,80 @@ static const struct mtk_mmsys_routes > mmsys_mt8188_routing_table[] = { > > }, > > }; > > > > +static const struct mtk_mmsys_routes > mmsys_mt8188_vdo1_routing_table[] = { > > +{ > > +DDP_COMPONENT_MDP_RDMA0, DDP_COMPONENT_MERGE1, > > +MT8188_VDO1_VPP_MERGE0_P0_SEL_IN, GENMASK(0, 0), > > +MT8188_VPP_MERGE0_P0_SEL_IN_FROM_MDP_RDMA0 > > +}, { > > +DDP_COMPONENT_MDP_RDMA1, DDP_COMPONENT_MERGE1, > > +MT8188_VDO1_VPP_MERGE0_P1_SEL_IN, GENMASK(0, 0), > > +MT8188_VPP_MERGE0_P1_SEL_IN_FROM_MDP_RDMA1 > > +}, { > > +DDP_COMPONENT_MDP_RDMA2, DDP_COMPONENT_MERGE2, > > +MT8188_VDO1_VPP_MERGE1_P0_SEL_IN, GENMASK(0, 0), > > +MT8188_VPP_MERGE1_P0_SEL_IN_FROM_MDP_RDMA2 > > +}, { > > +DDP_COMPONENT_MERGE1, DDP_COMPONENT_ETHDR_MIXER, > > +MT8188_VDO1_MERGE0_ASYNC_SOUT_SEL, GENMASK(1, 0), > > +MT8188_SOUT_TO_MIXER_IN1_SEL > > +}, { > > +DDP_COMPONENT_MERGE2, DDP_COMPONENT_ETHDR_MIXER, > > +MT8188_VDO1_MERGE1_ASYNC_SOUT_SEL, GENMASK(1, 0), > > +MT8188_SOUT_TO_MIXER_IN2_SEL > > +}, { > > +DDP_COMPONENT_MERGE3, DDP_COMPONENT_ETHDR_MIXER, > > +MT8188_VDO1_MERGE2_ASYNC_SOUT_SEL, GENMASK(1, 0), > > +MT8188_SOUT_TO_MIXER_IN3_SEL > > +}, { > > +DDP_COMPONENT_MERGE4, DDP_COMPONENT_ETHDR_MIXER, > > +MT8188_VDO1_MERGE3_ASYNC_SOUT_SEL, GENMASK(1, 0), > > +MT8188_SOUT_TO_MIXER_IN4_SEL > > +}, { > > +DDP_COMPONENT_ETHDR_MIXER, DDP_COMPONENT_MERGE5, > > +MT8188_VDO1_MIXER_OUT_SOUT_SEL, GENMASK(0, 0), > > +MT8188_MIXER_SOUT_TO_MERGE4_ASYNC_SEL > > +}, { > > +DDP_COMPONENT_MERGE1, DDP_COMPONENT_ETHDR_MIXER, > > +MT8188_VDO1_MIXER_IN1_SEL_IN, GENMASK(0, 0), > > +MT8188_MIXER_IN1_SEL_IN_FROM_MERGE0_ASYNC_SOUT > > +}, { > > +DDP_COMPONENT_MERGE2, DDP_COMPONENT_ETHDR_MIXER, > > +MT8188_VDO1_MIXER_IN2_SEL_IN, GENMASK(0, 0), > > +MT8188_MIXER_IN2_SEL_IN_FROM_MERGE1_ASYNC_SOUT > > +}, { > > +DDP_COMPONENT_MERGE3, DDP_COMPONENT_ETHDR_MIXER, > > +MT8188_VDO1_MIXER_IN3_SEL_IN, GENMASK(0, 0), > > +MT8188_MIXER_IN3_SEL_IN_FROM_MERGE2_ASYNC_SOUT > > +}, { > > +DDP_COMPONENT_MERGE4, DDP_COMPONENT_ETHDR_MIXER, > > +MT8188_VDO1_MIXER_IN4_SEL_IN, GENMASK(0, 0), > > +MT8188_MIXER_IN4_SEL_IN_FROM_MERGE3_ASYNC_SOUT > > +}, { > > +DDP_COMPONENT_ETHDR_MIXER, DDP_COMPONENT_MERGE5, > > +MT8188_VDO1_MIXER_SOUT_SEL_IN, GENMASK(2, 0), > > +MT8188_MIXER_SOUT_SEL_IN_FROM_DISP_MIXER > > +}, { > > +DDP_COMPONENT_ETHDR_MIXER, DDP_COMPONENT_MERGE5, > > +MT8188_VDO1_MERGE4_ASYNC_SEL_IN, GENMASK(2, 0), > > +MT8188_MERGE4_ASYNC_SEL_IN_FROM_MIXER_OUT_SOUT > > +}, { > > +DDP_COMPONENT_MERGE5, DDP_COMPONENT_DPI1, > > +MT8188_VDO1_DISP_DPI1_SEL_IN, GENMASK(1, 0), > > +MT8188_DISP_DPI1_SEL_IN_FROM_VPP_MERGE4_MOUT > > +}, { > > +DDP_COMPONENT_MERGE5, DDP_COMPONENT_DPI1, > > +MT8188_VDO1_MERGE4_SOUT_SEL, GENMASK(1, 0), > > +MT8188_MERGE4_SOUT_TO_DPI1_SEL > > +}, { > > +DDP_COMPONENT_MERGE5, DDP_COMPONENT_DP_INTF1, > > +MT8188_VDO1_DISP_DP_INTF0_SEL_IN, GENMASK(1, 0), > > +MT8188_DISP_DP_INTF0_SEL_IN_FROM_VPP_MERGE4_MOUT > > +}, { > > +DDP_COMPONENT_MERGE5, DDP_COMPONENT_DP_INTF1, > > +MT8188_VDO1_MERGE4_SOUT_SEL, GENMASK(3, 0), > > +MT8188_MERGE4_SOUT_TO_DP_INTF0_SEL > > +} > > +}; > > + > > #endif /* __SOC_MEDIATEK_MT8188_MMSYS_H */ > > diff --git a/drivers/soc/mediatek/mtk-mmsys.c > b/drivers/soc/mediatek/mtk-mmsys.c > > index 9619faa796e8..3a81ef2bcc3c 100644 > > --- a/drivers/soc/mediatek/mtk-mmsys.c > > +++ b/drivers/soc/mediatek/mtk-mmsys.c > > @@ -89,6 +89,15 @@ static const struct mtk_mmsys_driver_data > mt8188_vdosys0_driver_data = { > > .num_routes = ARRAY_SIZE(mmsys_mt8188_routing_table), > > }; > > > > +static const struct mtk_mmsys_driver_data > mt8188_vdosys1_driver_data = { > > +.clk_driver = "clk-mt8188-vdo1", > > +.routes = mmsys_mt8188_vdo1_routing_table, > > +.num_routes = ARRAY_SIZE(mmsys_mt8188_vdo1_routing_table), > > +.sw0_rst_offset = MT8188_VDO1_SW0_RST_B, > > +.num_resets = 96, > > +.vsync_len = 1, > > +}; > > + > > static const struct mtk_mmsys_driver_data > mt8192_mmsys_driver_data = { > > .clk_driver = "clk-mt8192-mm", > > .routes = mmsys_mt8192_routing_table, > > @@ -213,6 +222,9 @@ void mtk_mmsys_mixer_in_config(struct device > *dev, int idx, bool alpha_sel, u16 > > alpha_sel << (19 + idx), cmdq_pkt); > > mtk_mmsys_update_bits(mmsys, MT8195_VDO1_MIXER_IN1_PAD + (idx - > 1) * 4, > > GENMASK(31, 16) | GENMASK(1, 0), biwidth << 16 | mode, > cmdq_pkt); > > +if (mmsys->data->vsync_len) > > +mtk_mmsys_update_bits(mmsys, MT8188_VDO1_MIXER_VSYNC_LEN, ~0, > > + mmsys->data->vsync_len, cmdq_pkt); > > } > > EXPORT_SYMBOL_GPL(mtk_mmsys_mixer_in_config); > > > > @@ -431,6 +443,7 @@ static const struct of_device_id > of_match_mtk_mmsys[] = { > > { .compatible = "mediatek,mt8183-mmsys", .data = > &mt8183_mmsys_driver_data }, > > { .compatible = "mediatek,mt8186-mmsys", .data = > &mt8186_mmsys_driver_data }, > > { .compatible = "mediatek,mt8188-vdosys0", .data = > &mt8188_vdosys0_driver_data }, > > +{ .compatible = "mediatek,mt8188-vdosys1", .data = > &mt8188_vdosys1_driver_data }, > > { .compatible = "mediatek,mt8192-mmsys", .data = > &mt8192_mmsys_driver_data }, > > /* "mediatek,mt8195-mmsys" compatible is deprecated */ > > { .compatible = "mediatek,mt8195-mmsys", .data = > &mt8195_vdosys0_driver_data }, > > diff --git a/drivers/soc/mediatek/mtk-mmsys.h > b/drivers/soc/mediatek/mtk-mmsys.h > > index 6725403d2e3a..e4ab46017430 100644 > > --- a/drivers/soc/mediatek/mtk-mmsys.h > > +++ b/drivers/soc/mediatek/mtk-mmsys.h > > @@ -86,6 +86,34 @@ struct mtk_mmsys_routes { > > u32 val; > > }; > > > > +/** > > + * struct mtk_mmsys_driver_data - settings for the mmsys > > + * @clk_driver: Clock driver name that the mmsys is using > > + * (defined in drivers/clk/mediatek/clk-*.c). > > + * @routes: Routing table of the mmsys. > > + * It provides mux settings from one module to another. > > + * @num_routes: Array size of the routes. > > + * @sw0_rst_offset: Register offset for the reset control. > > + * @num_resets: Number of reset bits that are defined > > + * @is_vppsys: Whether the mmsys is VPPSYS (Video Processing Pipe) > > + * or VDOSYS (Video). Only VDOSYS needs to be added to > drm driver. > > + * @vsync_len: VSYNC length of the MIXER. > > + * VSYNC is usually triggered by the connector, so its > length is > > + * a fixed value as long as the frame rate is decided, > but ETDHR and > > + * MIXER generate their own VSYNC due to hardware > design, therefore > > + * MIXER has to sync with ETHDR by adjusting VSYNC > length. > > + * On MT8195, there is no such setting so we use the > gap between > > + * falling edge and rising edge of SOF (Start of > Frame) signal to > > + * do the job, but since MT8188, VSNYC_LEN setting is > introduced to > > + * solve the problem and is given 0x40 (ticks) as the > default value. > > + * Please notice that this value has to be set to 1 > (minimum) if > > + * ETHDR is bypassed, otherwise MIXER could wait too > long and causing > > + * underflow. > > + * > > + * Each MMSYS (multi-media system) may have different settings, > they may use > > + * different clock sources, mux settings, reset control ...etc., > and these > > + * differences are all stored here. > > + */ > > struct mtk_mmsys_driver_data { > > const char *clk_driver; > > const struct mtk_mmsys_routes *routes; > > @@ -93,6 +121,7 @@ struct mtk_mmsys_driver_data { > > const u16 sw0_rst_offset; > > const u32 num_resets; > > const bool is_vppsys; > > +const u8 vsync_len; > > }; > > > > /* > > diff --git a/drivers/soc/mediatek/mtk-mutex.c > b/drivers/soc/mediatek/mtk-mutex.c > > index 26f3d9a41496..11dda20eb462 100644 > > --- a/drivers/soc/mediatek/mtk-mutex.c > > +++ b/drivers/soc/mediatek/mtk-mutex.c > > @@ -134,6 +134,22 @@ > > #define MT8188_MUTEX_MOD_DISP_POSTMASK024 > > #define MT8188_MUTEX_MOD2_DISP_PWM033 > > > > +#define MT8188_MUTEX_MOD_DISP1_MDP_RDMA00 > > +#define MT8188_MUTEX_MOD_DISP1_MDP_RDMA11 > > +#define MT8188_MUTEX_MOD_DISP1_MDP_RDMA22 > > +#define MT8188_MUTEX_MOD_DISP1_MDP_RDMA33 > > +#define MT8188_MUTEX_MOD_DISP1_MDP_RDMA44 > > +#define MT8188_MUTEX_MOD_DISP1_MDP_RDMA55 > > +#define MT8188_MUTEX_MOD_DISP1_MDP_RDMA66 > > +#define MT8188_MUTEX_MOD_DISP1_MDP_RDMA77 > > +#define MT8188_MUTEX_MOD_DISP1_VPP_MERGE020 > > +#define MT8188_MUTEX_MOD_DISP1_VPP_MERGE121 > > +#define MT8188_MUTEX_MOD_DISP1_VPP_MERGE222 > > +#define MT8188_MUTEX_MOD_DISP1_VPP_MERGE323 > > +#define MT8188_MUTEX_MOD_DISP1_VPP_MERGE424 > > +#define MT8188_MUTEX_MOD_DISP1_DISP_MIXER30 > > +#define MT8188_MUTEX_MOD_DISP1_DP_INTF139 > > + > > #define MT8195_MUTEX_MOD_DISP_OVL00 > > #define MT8195_MUTEX_MOD_DISP_WDMA01 > > #define MT8195_MUTEX_MOD_DISP_RDMA02 > > @@ -265,6 +281,7 @@ > > #define MT8183_MUTEX_SOF_DPI02 > > #define MT8188_MUTEX_SOF_DSI01 > > #define MT8188_MUTEX_SOF_DP_INTF03 > > +#define MT8188_MUTEX_SOF_DP_INTF14 > > #define MT8195_MUTEX_SOF_DSI01 > > #define MT8195_MUTEX_SOF_DSI12 > > #define MT8195_MUTEX_SOF_DP_INTF03 > > @@ -276,6 +293,7 @@ > > #define MT8183_MUTEX_EOF_DPI0(MT8183_MUTEX_SOF_DPI0 << 6) > > #define MT8188_MUTEX_EOF_DSI0(MT8188_MUTEX_SOF_DSI0 << 7) > > #define MT8188_MUTEX_EOF_DP_INTF0(MT8188_MUTEX_SOF_DP_INTF0 << 7) > > +#define MT8188_MUTEX_EOF_DP_INTF1(MT8188_MUTEX_SOF_DP_INTF1 << 7) > > #define MT8195_MUTEX_EOF_DSI0(MT8195_MUTEX_SOF_DSI0 << 7) > > #define MT8195_MUTEX_EOF_DSI1(MT8195_MUTEX_SOF_DSI1 << 7) > > #define MT8195_MUTEX_EOF_DP_INTF0(MT8195_MUTEX_SOF_DP_INTF0 << 7) > > @@ -446,6 +464,21 @@ static const unsigned int > mt8188_mutex_mod[DDP_COMPONENT_ID_MAX] = { > > [DDP_COMPONENT_DSI0] = MT8188_MUTEX_MOD_DISP_DSI0, > > [DDP_COMPONENT_PWM0] = MT8188_MUTEX_MOD2_DISP_PWM0, > > [DDP_COMPONENT_DP_INTF0] = MT8188_MUTEX_MOD_DISP_DP_INTF0, > > +[DDP_COMPONENT_MDP_RDMA0] = MT8188_MUTEX_MOD_DISP1_MDP_RDMA0, > > +[DDP_COMPONENT_MDP_RDMA1] = MT8188_MUTEX_MOD_DISP1_MDP_RDMA1, > > +[DDP_COMPONENT_MDP_RDMA2] = MT8188_MUTEX_MOD_DISP1_MDP_RDMA2, > > +[DDP_COMPONENT_MDP_RDMA3] = MT8188_MUTEX_MOD_DISP1_MDP_RDMA3, > > +[DDP_COMPONENT_MDP_RDMA4] = MT8188_MUTEX_MOD_DISP1_MDP_RDMA4, > > +[DDP_COMPONENT_MDP_RDMA5] = MT8188_MUTEX_MOD_DISP1_MDP_RDMA5, > > +[DDP_COMPONENT_MDP_RDMA6] = MT8188_MUTEX_MOD_DISP1_MDP_RDMA6, > > +[DDP_COMPONENT_MDP_RDMA7] = MT8188_MUTEX_MOD_DISP1_MDP_RDMA7, > > +[DDP_COMPONENT_MERGE1] = MT8188_MUTEX_MOD_DISP1_VPP_MERGE0, > > +[DDP_COMPONENT_MERGE2] = MT8188_MUTEX_MOD_DISP1_VPP_MERGE1, > > +[DDP_COMPONENT_MERGE3] = MT8188_MUTEX_MOD_DISP1_VPP_MERGE2, > > +[DDP_COMPONENT_MERGE4] = MT8188_MUTEX_MOD_DISP1_VPP_MERGE3, > > +[DDP_COMPONENT_ETHDR_MIXER] = MT8188_MUTEX_MOD_DISP1_DISP_MIXER, > > +[DDP_COMPONENT_MERGE5] = MT8188_MUTEX_MOD_DISP1_VPP_MERGE4, > > +[DDP_COMPONENT_DP_INTF1] = MT8188_MUTEX_MOD_DISP1_DP_INTF1, > > }; > > > > static const unsigned int mt8192_mutex_mod[DDP_COMPONENT_ID_MAX] > = { > > @@ -606,6 +639,8 @@ static const unsigned int > mt8188_mutex_sof[DDP_MUTEX_SOF_MAX] = { > > MT8188_MUTEX_SOF_DSI0 | MT8188_MUTEX_EOF_DSI0, > > [MUTEX_SOF_DP_INTF0] = > > MT8188_MUTEX_SOF_DP_INTF0 | MT8188_MUTEX_EOF_DP_INTF0, > > +[MUTEX_SOF_DP_INTF1] = > > +MT8188_MUTEX_SOF_DP_INTF1 | MT8188_MUTEX_EOF_DP_INTF1, > > }; > > > > static const unsigned int mt8195_mutex_sof[DDP_MUTEX_SOF_MAX] = { > > -- > > 2.18.0 > > >