From: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
To: Hsiao Chien Sung <shawn.sung@mediatek.com>,
Chun-Kuang Hu <chunkuang.hu@kernel.org>,
Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>,
Matthias Brugger <matthias.bgg@gmail.com>,
Philipp Zabel <p.zabel@pengutronix.de>,
Rob Herring <robh+dt@kernel.org>
Cc: linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
linux-mediatek@lists.infradead.org, devicetree@vger.kernel.org,
Project_Global_Chrome_Upstream_Group@mediatek.com,
Singo Chang <singo.chang@mediatek.com>,
Nancy Lin <nancy.lin@mediatek.com>,
Jason-JH Lin <jason-jh.lin@mediatek.com>
Subject: Re: [PATCH v4 13/14] drm/mediatek: Sort OVL adaptor components in alphabetical order
Date: Wed, 21 Jun 2023 10:16:16 +0200 [thread overview]
Message-ID: <8442c6a4-14a7-e3b3-0a82-0797ef3ddd77@collabora.com> (raw)
In-Reply-To: <20230621031938.5884-14-shawn.sung@mediatek.com>
Il 21/06/23 05:19, Hsiao Chien Sung ha scritto:
> - Rename OVL_ADAPTOR_TYPE_RDMA to OVL_ADAPTOR_TYPE_MDP_RDMA
> to align the naming rule of mtk_ovl_adaptor_comp_id.
> - Sort components' names in alphabetical order
> - Sort device table in alphabetical order
> - Add sentinel to device table
>
> Signed-off-by: Hsiao Chien Sung <shawn.sung@mediatek.com>
I agree, but this commit should come before [12/14] of this series.
Regards,
Angelo
> ---
> .../gpu/drm/mediatek/mtk_disp_ovl_adaptor.c | 61 ++++++++-----------
> 1 file changed, 27 insertions(+), 34 deletions(-)
>
> diff --git a/drivers/gpu/drm/mediatek/mtk_disp_ovl_adaptor.c b/drivers/gpu/drm/mediatek/mtk_disp_ovl_adaptor.c
> index 69ae531294ff..4120d08e4969 100644
> --- a/drivers/gpu/drm/mediatek/mtk_disp_ovl_adaptor.c
> +++ b/drivers/gpu/drm/mediatek/mtk_disp_ovl_adaptor.c
> @@ -26,13 +26,14 @@
> #define MTK_OVL_ADAPTOR_LAYER_NUM 4
>
> enum mtk_ovl_adaptor_comp_type {
> - OVL_ADAPTOR_TYPE_RDMA = 0,
> - OVL_ADAPTOR_TYPE_MERGE,
> OVL_ADAPTOR_TYPE_ETHDR,
> + OVL_ADAPTOR_TYPE_MDP_RDMA,
> + OVL_ADAPTOR_TYPE_MERGE,
> OVL_ADAPTOR_TYPE_NUM,
> };
>
> enum mtk_ovl_adaptor_comp_id {
> + OVL_ADAPTOR_ETHDR0,
> OVL_ADAPTOR_MDP_RDMA0,
> OVL_ADAPTOR_MDP_RDMA1,
> OVL_ADAPTOR_MDP_RDMA2,
> @@ -45,7 +46,6 @@ enum mtk_ovl_adaptor_comp_id {
> OVL_ADAPTOR_MERGE1,
> OVL_ADAPTOR_MERGE2,
> OVL_ADAPTOR_MERGE3,
> - OVL_ADAPTOR_ETHDR0,
> OVL_ADAPTOR_ID_MAX
> };
>
> @@ -62,21 +62,21 @@ struct mtk_disp_ovl_adaptor {
> };
>
> static const char * const private_comp_stem[OVL_ADAPTOR_TYPE_NUM] = {
> - [OVL_ADAPTOR_TYPE_RDMA] = "vdo1-rdma",
> - [OVL_ADAPTOR_TYPE_MERGE] = "merge",
> [OVL_ADAPTOR_TYPE_ETHDR] = "ethdr",
> + [OVL_ADAPTOR_TYPE_MDP_RDMA] = "vdo1-rdma",
> + [OVL_ADAPTOR_TYPE_MERGE] = "merge",
> };
>
> static const struct ovl_adaptor_comp_match comp_matches[OVL_ADAPTOR_ID_MAX] = {
> [OVL_ADAPTOR_ETHDR0] = { OVL_ADAPTOR_TYPE_ETHDR, DDP_COMPONENT_ETHDR_MIXER, 0 },
> - [OVL_ADAPTOR_MDP_RDMA0] = { OVL_ADAPTOR_TYPE_RDMA, DDP_COMPONENT_MDP_RDMA0, 0 },
> - [OVL_ADAPTOR_MDP_RDMA1] = { OVL_ADAPTOR_TYPE_RDMA, DDP_COMPONENT_MDP_RDMA1, 1 },
> - [OVL_ADAPTOR_MDP_RDMA2] = { OVL_ADAPTOR_TYPE_RDMA, DDP_COMPONENT_MDP_RDMA2, 2 },
> - [OVL_ADAPTOR_MDP_RDMA3] = { OVL_ADAPTOR_TYPE_RDMA, DDP_COMPONENT_MDP_RDMA3, 3 },
> - [OVL_ADAPTOR_MDP_RDMA4] = { OVL_ADAPTOR_TYPE_RDMA, DDP_COMPONENT_MDP_RDMA4, 4 },
> - [OVL_ADAPTOR_MDP_RDMA5] = { OVL_ADAPTOR_TYPE_RDMA, DDP_COMPONENT_MDP_RDMA5, 5 },
> - [OVL_ADAPTOR_MDP_RDMA6] = { OVL_ADAPTOR_TYPE_RDMA, DDP_COMPONENT_MDP_RDMA6, 6 },
> - [OVL_ADAPTOR_MDP_RDMA7] = { OVL_ADAPTOR_TYPE_RDMA, DDP_COMPONENT_MDP_RDMA7, 7 },
> + [OVL_ADAPTOR_MDP_RDMA0] = { OVL_ADAPTOR_TYPE_MDP_RDMA, DDP_COMPONENT_MDP_RDMA0, 0 },
> + [OVL_ADAPTOR_MDP_RDMA1] = { OVL_ADAPTOR_TYPE_MDP_RDMA, DDP_COMPONENT_MDP_RDMA1, 1 },
> + [OVL_ADAPTOR_MDP_RDMA2] = { OVL_ADAPTOR_TYPE_MDP_RDMA, DDP_COMPONENT_MDP_RDMA2, 2 },
> + [OVL_ADAPTOR_MDP_RDMA3] = { OVL_ADAPTOR_TYPE_MDP_RDMA, DDP_COMPONENT_MDP_RDMA3, 3 },
> + [OVL_ADAPTOR_MDP_RDMA4] = { OVL_ADAPTOR_TYPE_MDP_RDMA, DDP_COMPONENT_MDP_RDMA4, 4 },
> + [OVL_ADAPTOR_MDP_RDMA5] = { OVL_ADAPTOR_TYPE_MDP_RDMA, DDP_COMPONENT_MDP_RDMA5, 5 },
> + [OVL_ADAPTOR_MDP_RDMA6] = { OVL_ADAPTOR_TYPE_MDP_RDMA, DDP_COMPONENT_MDP_RDMA6, 6 },
> + [OVL_ADAPTOR_MDP_RDMA7] = { OVL_ADAPTOR_TYPE_MDP_RDMA, DDP_COMPONENT_MDP_RDMA7, 7 },
> [OVL_ADAPTOR_MERGE0] = { OVL_ADAPTOR_TYPE_MERGE, DDP_COMPONENT_MERGE1, 1 },
> [OVL_ADAPTOR_MERGE1] = { OVL_ADAPTOR_TYPE_MERGE, DDP_COMPONENT_MERGE2, 2 },
> [OVL_ADAPTOR_MERGE2] = { OVL_ADAPTOR_TYPE_MERGE, DDP_COMPONENT_MERGE3, 3 },
> @@ -94,10 +94,7 @@ static int mtk_ovl_adaptor_enable(struct device *dev, enum mtk_ovl_adaptor_comp_
> case OVL_ADAPTOR_TYPE_ETHDR:
> ret = mtk_ethdr_clk_enable(dev);
> break;
> - case OVL_ADAPTOR_TYPE_MERGE:
> - ret = mtk_merge_clk_enable(dev);
> - break;
> - case OVL_ADAPTOR_TYPE_RDMA:
> + case OVL_ADAPTOR_TYPE_MDP_RDMA:
> // only LARB users need to do this
> ret = pm_runtime_get_sync(dev);
> if (ret < 0) {
> @@ -108,6 +105,9 @@ static int mtk_ovl_adaptor_enable(struct device *dev, enum mtk_ovl_adaptor_comp_
> if (ret)
> pm_runtime_put(dev);
> break;
> + case OVL_ADAPTOR_TYPE_MERGE:
> + ret = mtk_merge_clk_enable(dev);
> + break;
> default:
> dev_err(dev, "Unknown type: %d\n", type);
> }
> @@ -128,13 +128,13 @@ static void mtk_ovl_adaptor_disable(struct device *dev, enum mtk_ovl_adaptor_com
> case OVL_ADAPTOR_TYPE_ETHDR:
> mtk_ethdr_clk_disable(dev);
> break;
> - case OVL_ADAPTOR_TYPE_MERGE:
> - mtk_merge_clk_disable(dev);
> - break;
> - case OVL_ADAPTOR_TYPE_RDMA:
> + case OVL_ADAPTOR_TYPE_MDP_RDMA:
> mtk_mdp_rdma_clk_disable(dev);
> pm_runtime_put(dev);
> break;
> + case OVL_ADAPTOR_TYPE_MERGE:
> + mtk_merge_clk_disable(dev);
> + break;
> default:
> dev_err(dev, "Unknown type: %d\n", type);
> }
> @@ -353,6 +353,7 @@ void mtk_ovl_adaptor_remove_comp(struct device *dev, struct mtk_mutex *mutex)
>
> void mtk_ovl_adaptor_connect(struct device *dev, struct device *mmsys_dev, unsigned int next)
> {
> + mtk_mmsys_ddp_connect(mmsys_dev, DDP_COMPONENT_ETHDR_MIXER, next);
> mtk_mmsys_ddp_connect(mmsys_dev, DDP_COMPONENT_MDP_RDMA0, DDP_COMPONENT_MERGE1);
> mtk_mmsys_ddp_connect(mmsys_dev, DDP_COMPONENT_MDP_RDMA1, DDP_COMPONENT_MERGE1);
> mtk_mmsys_ddp_connect(mmsys_dev, DDP_COMPONENT_MDP_RDMA2, DDP_COMPONENT_MERGE2);
> @@ -360,11 +361,11 @@ void mtk_ovl_adaptor_connect(struct device *dev, struct device *mmsys_dev, unsig
> mtk_mmsys_ddp_connect(mmsys_dev, DDP_COMPONENT_MERGE2, DDP_COMPONENT_ETHDR_MIXER);
> mtk_mmsys_ddp_connect(mmsys_dev, DDP_COMPONENT_MERGE3, DDP_COMPONENT_ETHDR_MIXER);
> mtk_mmsys_ddp_connect(mmsys_dev, DDP_COMPONENT_MERGE4, DDP_COMPONENT_ETHDR_MIXER);
> - mtk_mmsys_ddp_connect(mmsys_dev, DDP_COMPONENT_ETHDR_MIXER, next);
> }
>
> void mtk_ovl_adaptor_disconnect(struct device *dev, struct device *mmsys_dev, unsigned int next)
> {
> + mtk_mmsys_ddp_disconnect(mmsys_dev, DDP_COMPONENT_ETHDR_MIXER, next);
> mtk_mmsys_ddp_disconnect(mmsys_dev, DDP_COMPONENT_MDP_RDMA0, DDP_COMPONENT_MERGE1);
> mtk_mmsys_ddp_disconnect(mmsys_dev, DDP_COMPONENT_MDP_RDMA1, DDP_COMPONENT_MERGE1);
> mtk_mmsys_ddp_disconnect(mmsys_dev, DDP_COMPONENT_MDP_RDMA2, DDP_COMPONENT_MERGE2);
> @@ -372,7 +373,6 @@ void mtk_ovl_adaptor_disconnect(struct device *dev, struct device *mmsys_dev, un
> mtk_mmsys_ddp_disconnect(mmsys_dev, DDP_COMPONENT_MERGE2, DDP_COMPONENT_ETHDR_MIXER);
> mtk_mmsys_ddp_disconnect(mmsys_dev, DDP_COMPONENT_MERGE3, DDP_COMPONENT_ETHDR_MIXER);
> mtk_mmsys_ddp_disconnect(mmsys_dev, DDP_COMPONENT_MERGE4, DDP_COMPONENT_ETHDR_MIXER);
> - mtk_mmsys_ddp_disconnect(mmsys_dev, DDP_COMPONENT_ETHDR_MIXER, next);
> }
>
> static int ovl_adaptor_comp_get_id(struct device *dev, struct device_node *node,
> @@ -391,17 +391,10 @@ static int ovl_adaptor_comp_get_id(struct device *dev, struct device_node *node,
> }
>
> static const struct of_device_id mtk_ovl_adaptor_comp_dt_ids[] = {
> - {
> - .compatible = "mediatek,mt8195-vdo1-rdma",
> - .data = (void *)OVL_ADAPTOR_TYPE_RDMA,
> - }, {
> - .compatible = "mediatek,mt8195-disp-merge",
> - .data = (void *)OVL_ADAPTOR_TYPE_MERGE,
> - }, {
> - .compatible = "mediatek,mt8195-disp-ethdr",
> - .data = (void *)OVL_ADAPTOR_TYPE_ETHDR,
> - },
> - {},
> + { .compatible = "mediatek,mt8195-disp-ethdr", .data = (void *)OVL_ADAPTOR_TYPE_ETHDR },
> + { .compatible = "mediatek,mt8195-disp-merge", .data = (void *)OVL_ADAPTOR_TYPE_MERGE },
> + { .compatible = "mediatek,mt8195-vdo1-rdma", .data = (void *)OVL_ADAPTOR_TYPE_MDP_RDMA },
> + { /* sentinel */ }
> };
>
> static int compare_of(struct device *dev, void *data)
next prev parent reply other threads:[~2023-06-21 8:16 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-21 3:19 [PATCH v4 00/14] Add display driver for MT8188 VDOSYS1 Hsiao Chien Sung
2023-06-21 3:19 ` [PATCH v4 01/14] dt-bindings: display: mediatek: ethdr: Add compatible for MT8188 Hsiao Chien Sung
2023-06-21 3:19 ` [PATCH v4 02/14] dt-bindings: display: mediatek: mdp-rdma: " Hsiao Chien Sung
2023-06-21 3:19 ` [PATCH v4 03/14] dt-bindings: display: mediatek: merge: " Hsiao Chien Sung
2023-06-21 3:19 ` [PATCH v4 04/14] dt-bindings: display: mediatek: padding: Add MT8188 Hsiao Chien Sung
2023-06-21 6:35 ` Krzysztof Kozlowski
2023-06-21 3:19 ` [PATCH v4 05/14] dt-bindings: arm: mediatek: Add compatible for MT8188 Hsiao Chien Sung
2023-06-21 3:19 ` [PATCH v4 06/14] dt-bindings: reset: mt8188: Add VDOSYS reset control bits Hsiao Chien Sung
2023-06-21 6:35 ` Krzysztof Kozlowski
2023-06-21 3:19 ` [PATCH v4 07/14] soc: mediatek: Support MT8188 VDOSYS1 in mtk-mmsys Hsiao Chien Sung
2023-06-21 3:19 ` [PATCH v4 08/14] soc: mediatek: Support MT8188 VDOSYS1 Padding " Hsiao Chien Sung
2023-06-21 3:19 ` [PATCH v4 09/14] soc: mediatek: Support reset bit mapping in mmsys driver Hsiao Chien Sung
2023-06-21 8:06 ` AngeloGioacchino Del Regno
2023-06-21 3:19 ` [PATCH v4 10/14] soc: mediatek: Add MT8188 VDOSYS reset bit map Hsiao Chien Sung
2023-06-21 8:06 ` AngeloGioacchino Del Regno
2023-06-21 3:19 ` [PATCH v4 11/14] drm/mediatek: Support MT8188 VDOSYS1 in display driver Hsiao Chien Sung
2023-06-21 3:19 ` [PATCH v4 12/14] drm/mediatek: Improve compatibility of " Hsiao Chien Sung
2023-06-21 8:15 ` AngeloGioacchino Del Regno
2023-06-27 7:25 ` Shawn Sung (宋孝謙)
2023-06-21 3:19 ` [PATCH v4 13/14] drm/mediatek: Sort OVL adaptor components in alphabetical order Hsiao Chien Sung
2023-06-21 8:16 ` AngeloGioacchino Del Regno [this message]
2023-06-21 9:16 ` Shawn Sung (宋孝謙)
2023-06-21 10:00 ` AngeloGioacchino Del Regno
2023-06-21 3:19 ` [PATCH v4 14/14] drm/mediatek: Support MT8188 Padding in display driver Hsiao Chien Sung
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=8442c6a4-14a7-e3b3-0a82-0797ef3ddd77@collabora.com \
--to=angelogioacchino.delregno@collabora.com \
--cc=Project_Global_Chrome_Upstream_Group@mediatek.com \
--cc=chunkuang.hu@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=jason-jh.lin@mediatek.com \
--cc=krzysztof.kozlowski+dt@linaro.org \
--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=nancy.lin@mediatek.com \
--cc=p.zabel@pengutronix.de \
--cc=robh+dt@kernel.org \
--cc=shawn.sung@mediatek.com \
--cc=singo.chang@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