From: Nancy.Lin <nancy.lin@mediatek.com>
To: Enric Balletbo Serra <eballetbo@gmail.com>
Cc: CK Hu <ck.hu@mediatek.com>,
Chun-Kuang Hu <chunkuang.hu@kernel.org>,
srv_heupstream <srv_heupstream@mediatek.com>,
devicetree <devicetree@vger.kernel.org>,
David Airlie <airlied@linux.ie>,
"jason-jh . lin" <jason-jh.lin@mediatek.com>,
<singo.chang@mediatek.com>,
linux-kernel <linux-kernel@vger.kernel.org>,
dri-devel <dri-devel@lists.freedesktop.org>,
Yongqiang Niu <yongqiang.niu@mediatek.com>,
Rob Herring <robh+dt@kernel.org>,
"moderated list:ARM/Mediatek SoC support"
<linux-mediatek@lists.infradead.org>,
Matthias Brugger <matthias.bgg@gmail.com>,
Linux ARM <linux-arm-kernel@lists.infradead.org>
Subject: Re: [PATCH v2 07/14] soc: mediatek: add mtk-mmsys support for mt8195 vdosys1
Date: Wed, 28 Jul 2021 13:34:03 +0800 [thread overview]
Message-ID: <48be9a4ebb455737bfd640c6339f2ce05d02d4cd.camel@mediatek.com> (raw)
In-Reply-To: <CAFqH_53UpoChfrhXf41YRMGGPzjC9N2g3yNQQxc-J=7uPE44Cw@mail.gmail.com>
Hi Enric,
Thanks for your review.
On Fri, 2021-07-23 at 13:05 +0200, Enric Balletbo Serra wrote:
> Hi Nancy,
>
> Thank you for your patch.
>
> Missatge de Nancy.Lin <nancy.lin@mediatek.com> del dia dj., 22 de
> jul.
> 2021 a les 11:45:
> >
> > Add mt8195 vdosys1 clock driver name and routing table to
> > the driver data of mtk-mmsys.
> >
> > Signed-off-by: Nancy.Lin <nancy.lin@mediatek.com>
> > ---
> > drivers/soc/mediatek/mt8195-mmsys.h | 83
> > ++++++++++++++++++++++++--
> > drivers/soc/mediatek/mtk-mmsys.c | 10 ++++
> > include/linux/soc/mediatek/mtk-mmsys.h | 2 +
> > 3 files changed, 90 insertions(+), 5 deletions(-)
> >
> > diff --git a/drivers/soc/mediatek/mt8195-mmsys.h
> > b/drivers/soc/mediatek/mt8195-mmsys.h
> > index 73e9e8286d50..104ba575f765 100644
> > --- a/drivers/soc/mediatek/mt8195-mmsys.h
> > +++ b/drivers/soc/mediatek/mt8195-mmsys.h
> > @@ -64,16 +64,16 @@
> > #define SOUT_TO_VPP_MERGE0_P1_SEL (1
> > << 0)
> >
> > #define
> > MT8195_VDO1_MERGE0_ASYNC_SOUT_SEL 0xf40
> > -#define SOUT_TO_HDR_VDO_FE0 (0
> > << 0)
>
> This definition was introduced in this patch [1] that didn't land
> yet.
> And you're removing it now. Could you sync with Jason and only
> introduce the bits that are needed for your patches. Also all the
> comments I made to the Jason's patch apply here.
>
> [1]
> https://urldefense.com/v3/__https://patchwork.kernel.org/project/linux-mediatek/patch/20210723090233.24007-3-jason-jh.lin@mediatek.com/__;!!CTRNKA9wMg0ARbw!0rDdPxfBPcZC9icK37sCxT55RMqwRngO0BF4-uDwgYZP7UwQkx7iidkINqLBb7yi$
>
>
OK, I will sync with Jason and modify it.
> > +#define SOUT_TO_MIXER_IN1_SEL (1
> > << 0)
> >
> > #define
> > MT8195_VDO1_MERGE1_ASYNC_SOUT_SEL 0xf44
> > -#define SOUT_TO_HDR_VDO_FE1 (0
> > << 0)
> > +#define SOUT_TO_MIXER_IN2_SEL (1
> > << 0)
> >
> > #define
> > MT8195_VDO1_MERGE2_ASYNC_SOUT_SEL 0xf48
> > -#define SOUT_TO_HDR_GFX_FE0 (0
> > << 0)
> > +#define SOUT_TO_MIXER_IN3_SEL (1
> > << 0)
> >
> > #define
> > MT8195_VDO1_MERGE3_ASYNC_SOUT_SEL 0xf4c
> > -#define SOUT_TO_HDR_GFX_FE1 (0
> > << 0)
> > +#define SOUT_TO_MIXER_IN4_SEL (1
> > << 0)
> >
> > #define
> > MT8195_VDO1_MIXER_IN1_SOUT_SEL 0xf58
> > #define MIXER_IN1_SOUT_TO_DISP_MIXER (0
> > << 0)
> > @@ -88,7 +88,7 @@
> > #define MIXER_IN4_SOUT_TO_DISP_MIXER (0
> > << 0)
> >
> > #define
> > MT8195_VDO1_MIXER_OUT_SOUT_SEL 0xf34
> > -#define MIXER_SOUT_TO_HDR_VDO_BE0 (0
> > << 0)
> > +#define MIXER_SOUT_TO_MERGE4_ASYNC_SEL (1
> > << 0)
> >
> > #define
> > MT8195_VDO1_MERGE4_SOUT_SEL 0xf18
> > #define MERGE4_SOUT_TO_VDOSYS0 (0
> > << 0)
> > @@ -185,6 +185,79 @@ static const struct mtk_mmsys_routes
> > mmsys_mt8195_routing_table[] = {
> > }, {
> > DDP_COMPONENT_DSC0, DDP_COMPONENT_MERGE0,
> > MT8195_VDO0_SEL_OUT,
> > SOUT_DSC_WRAP0_OUT_TO_VPP_MERGE
> > + },
> > + {
> > + DDP_COMPONENT_PSEUDO_OVL, DDP_COMPONENT_MERGE5,
> > + MT8195_VDO1_VPP_MERGE0_P0_SEL_IN,
> > VPP_MERGE0_P0_SEL_IN_FROM_MDP_RDMA0
> > + },
> > + {
> > + DDP_COMPONENT_PSEUDO_OVL, DDP_COMPONENT_MERGE5,
> > + MT8195_VDO1_VPP_MERGE0_P1_SEL_IN,
> > VPP_MERGE0_P1_SEL_IN_FROM_MDP_RDMA1
> > + },
> > + {
> > + DDP_COMPONENT_PSEUDO_OVL, DDP_COMPONENT_MERGE5,
> > + MT8195_VDO1_VPP_MERGE1_P0_SEL_IN,
> > VPP_MERGE1_P0_SEL_IN_FROM_MDP_RDMA2
> > + },
> > + {
> > + DDP_COMPONENT_PSEUDO_OVL, DDP_COMPONENT_MERGE5,
> > + MT8195_VDO1_MERGE0_ASYNC_SOUT_SEL,
> > SOUT_TO_MIXER_IN1_SEL
> > + },
> > + {
> > + DDP_COMPONENT_PSEUDO_OVL, DDP_COMPONENT_MERGE5,
> > + MT8195_VDO1_MERGE1_ASYNC_SOUT_SEL,
> > SOUT_TO_MIXER_IN2_SEL
> > + },
> > + {
> > + DDP_COMPONENT_PSEUDO_OVL, DDP_COMPONENT_MERGE5,
> > + MT8195_VDO1_MERGE2_ASYNC_SOUT_SEL,
> > SOUT_TO_MIXER_IN3_SEL
> > + },
> > + {
> > + DDP_COMPONENT_PSEUDO_OVL, DDP_COMPONENT_MERGE5,
> > + MT8195_VDO1_MERGE3_ASYNC_SOUT_SEL,
> > SOUT_TO_MIXER_IN4_SEL
> > + },
> > + {
> > + DDP_COMPONENT_PSEUDO_OVL, DDP_COMPONENT_MERGE5,
> > + MT8195_VDO1_MIXER_OUT_SOUT_SEL,
> > MIXER_SOUT_TO_MERGE4_ASYNC_SEL
> > + },
> > + {
> > + DDP_COMPONENT_PSEUDO_OVL, DDP_COMPONENT_MERGE5,
> > + MT8195_VDO1_MIXER_IN1_SEL_IN,
> > MIXER_IN1_SEL_IN_FROM_MERGE0_ASYNC_SOUT
> > + },
> > + {
> > + DDP_COMPONENT_PSEUDO_OVL, DDP_COMPONENT_MERGE5,
> > + MT8195_VDO1_MIXER_IN2_SEL_IN,
> > MIXER_IN2_SEL_IN_FROM_MERGE1_ASYNC_SOUT
> > + },
> > + {
> > + DDP_COMPONENT_PSEUDO_OVL, DDP_COMPONENT_MERGE5,
> > + MT8195_VDO1_MIXER_IN3_SEL_IN,
> > MIXER_IN3_SEL_IN_FROM_MERGE2_ASYNC_SOUT
> > + },
> > + {
> > + DDP_COMPONENT_PSEUDO_OVL, DDP_COMPONENT_MERGE5,
> > + MT8195_VDO1_MIXER_IN4_SEL_IN,
> > MIXER_IN4_SEL_IN_FROM_MERGE3_ASYNC_SOUT
> > + },
> > + {
> > + DDP_COMPONENT_PSEUDO_OVL, DDP_COMPONENT_MERGE5,
> > + MT8195_VDO1_MIXER_SOUT_SEL_IN,
> > MIXER_SOUT_SEL_IN_FROM_DISP_MIXER
> > + },
> > + {
> > + DDP_COMPONENT_PSEUDO_OVL, DDP_COMPONENT_MERGE5,
> > + MT8195_VDO1_MERGE4_ASYNC_SEL_IN,
> > MERGE4_ASYNC_SEL_IN_FROM_MIXER_OUT_SOUT
> > + },
> > + {
> > + DDP_COMPONENT_MERGE5, DDP_COMPONENT_DPI1,
> > + MT8195_VDO1_DISP_DPI1_SEL_IN,
> > DISP_DPI1_SEL_IN_FROM_VPP_MERGE4_MOUT
> > + },
> > + {
> > + DDP_COMPONENT_MERGE5, DDP_COMPONENT_DPI1,
> > + MT8195_VDO1_MERGE4_SOUT_SEL,
> > MERGE4_SOUT_TO_DPI1_SEL
> > + },
> > + {
> > + DDP_COMPONENT_MERGE5, DDP_COMPONENT_DP_INTF1,
> > + MT8195_VDO1_DISP_DP_INTF0_SEL_IN,
> > + DISP_DP_INTF0_SEL_IN_FROM_VPP_MERGE4_MOUT
> > + },
> > + {
> > + DDP_COMPONENT_MERGE5, DDP_COMPONENT_DP_INTF1,
> > + MT8195_VDO1_MERGE4_SOUT_SEL,
> > MERGE4_SOUT_TO_DP_INTF0_SEL
> > }
> > };
> >
> > diff --git a/drivers/soc/mediatek/mtk-mmsys.c
> > b/drivers/soc/mediatek/mtk-mmsys.c
> > index 1fb241750897..9e31aad6c5c8 100644
> > --- a/drivers/soc/mediatek/mtk-mmsys.c
> > +++ b/drivers/soc/mediatek/mtk-mmsys.c
> > @@ -59,6 +59,12 @@ static const struct mtk_mmsys_driver_data
> > mt8195_vdosys0_driver_data = {
> > .num_routes = ARRAY_SIZE(mmsys_mt8195_routing_table),
> > };
> >
> > +static const struct mtk_mmsys_driver_data
> > mt8195_vdosys1_driver_data = {
> > + .clk_driver = "clk-mt8195-vdo1",
> > + .routes = mmsys_mt8195_routing_table,
> > + .num_routes = ARRAY_SIZE(mmsys_mt8195_routing_table),
> > +};
> > +
> > struct mtk_mmsys {
> > void __iomem *regs;
> > const struct mtk_mmsys_driver_data *data;
> > @@ -168,6 +174,10 @@ static const struct of_device_id
> > of_match_mtk_mmsys[] = {
> > .compatible = "mediatek,mt8195-vdosys0",
> > .data = &mt8195_vdosys0_driver_data,
> > },
> > + {
> > + .compatible = "mediatek,mt8195-vdosys1",
>
> Why do you need a second compatible, isn't this the same IP block? I
> mean, I understand that you have 2 mmsys blocks, but both are the
> same
> IP block, right? or are they different?
>
> Thanks,
> Enric
>
They(vdosys0 and vdosys1) are different IP block.
> > + .data = &mt8195_vdosys1_driver_data,
> > + },
> > { }
> > };
> >
> > diff --git a/include/linux/soc/mediatek/mtk-mmsys.h
> > b/include/linux/soc/mediatek/mtk-mmsys.h
> > index 34cb605e5df9..338c71570aeb 100644
> > --- a/include/linux/soc/mediatek/mtk-mmsys.h
> > +++ b/include/linux/soc/mediatek/mtk-mmsys.h
> > @@ -49,6 +49,8 @@ enum mtk_ddp_comp_id {
> > DDP_COMPONENT_DSC1,
> > DDP_COMPONENT_DSC1_VIRTUAL0,
> > DDP_COMPONENT_DP_INTF0,
> > + DDP_COMPONENT_DP_INTF1,
> > + DDP_COMPONENT_PSEUDO_OVL,
> > DDP_COMPONENT_ID_MAX,
> > };
> >
> > --
> > 2.18.0
> >
_______________________________________________
Linux-mediatek mailing list
Linux-mediatek@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-mediatek
next prev parent reply other threads:[~2021-07-28 5:34 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-22 9:45 [PATCH v2 00/14] Add MediaTek SoC DRM (vdosys1) support for mt8195 Nancy.Lin
2021-07-22 9:45 ` [PATCH v2 01/14] dt-bindings: mediatek: add vdosys1 RDMA/MERGE definition " Nancy.Lin
2021-07-22 9:45 ` [PATCH v2 02/14] dt-bindings: mediatek: add ethdr " Nancy.Lin
2021-07-22 9:45 ` [PATCH v2 03/14] dt-bindings: mediatek: Add #reset-cells to mmsys system controller Nancy.Lin
2021-07-22 9:45 ` [PATCH v2 04/14] dt-bindings: reset: mt8195: Move reset controller constants into common location Nancy.Lin
2021-07-23 11:10 ` Enric Balletbo Serra
2021-07-28 5:21 ` Nancy.Lin
2021-07-22 9:45 ` [PATCH v2 05/14] dt-bindings: reset: mt8195: add vdosys1 reset control bit Nancy.Lin
2021-07-22 9:45 ` [PATCH v2 06/14] arm64: dts: mt8195: add display node for vdosys1 Nancy.Lin
2021-07-22 9:45 ` [PATCH v2 07/14] soc: mediatek: add mtk-mmsys support for mt8195 vdosys1 Nancy.Lin
2021-07-23 11:05 ` Enric Balletbo Serra
2021-07-28 5:34 ` Nancy.Lin [this message]
2021-08-06 12:20 ` Matthias Brugger
2021-08-16 2:05 ` Nancy.Lin
2021-07-22 9:45 ` [PATCH v2 08/14] soc: mediatek: add mtk-mmsys config API " Nancy.Lin
2021-08-06 15:30 ` Matthias Brugger
2021-08-16 2:59 ` Nancy.Lin
2021-07-22 9:45 ` [PATCH v2 09/14] soc: mediatek: mmsys: Add reset controller support for MT8195 vdosys1 Nancy.Lin
2021-07-23 10:57 ` Enric Balletbo Serra
2021-07-28 6:00 ` Nancy.Lin
2021-07-28 10:31 ` Enric Balletbo Serra
2021-07-30 3:47 ` Nancy.Lin
2021-07-22 9:45 ` [PATCH v2 10/14] soc: mediatek: mmsys: add new mtk_mmsys struct member to store drm data Nancy.Lin
2021-07-22 9:45 ` [PATCH v2 11/14] soc: mediatek: add mtk-mutex support for mt8195 vdosys1 Nancy.Lin
2021-07-22 9:45 ` [PATCH 13/14] drm/mediatek: add pseudo ovl support for MT8195 Nancy.Lin
2021-07-25 1:57 ` Chun-Kuang Hu
2021-07-30 3:28 ` Nancy.Lin
2021-07-22 9:45 ` [PATCH v2 13/14] drm/mediatek: add ETHDR " Nancy.Lin
2021-07-27 23:39 ` Chun-Kuang Hu
2021-07-29 5:28 ` Nancy.Lin
2021-07-22 9:45 ` [PATCH v2 14/14] drm/mediatek: add mediatek-drm of vdosys1 " Nancy.Lin
2021-08-02 3:34 ` CK Hu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=48be9a4ebb455737bfd640c6339f2ce05d02d4cd.camel@mediatek.com \
--to=nancy.lin@mediatek.com \
--cc=airlied@linux.ie \
--cc=chunkuang.hu@kernel.org \
--cc=ck.hu@mediatek.com \
--cc=devicetree@vger.kernel.org \
--cc=dri-devel@lists.freedesktop.org \
--cc=eballetbo@gmail.com \
--cc=jason-jh.lin@mediatek.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mediatek@lists.infradead.org \
--cc=matthias.bgg@gmail.com \
--cc=robh+dt@kernel.org \
--cc=singo.chang@mediatek.com \
--cc=srv_heupstream@mediatek.com \
--cc=yongqiang.niu@mediatek.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).