[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <cff33ec51fcfd494088535f816ff68ecfb20636e.camel@mediatek.com>
Date: Wed, 27 Sep 2023 10:29:45 +0000
From: CK Hu (胡俊光) <ck.hu@...iatek.com>
To: Shawn Sung (宋孝謙)
<Shawn.Sung@...iatek.com>,
"matthias.bgg@...il.com" <matthias.bgg@...il.com>,
"angelogioacchino.delregno@...labora.com"
<angelogioacchino.delregno@...labora.com>,
"robh+dt@...nel.org" <robh+dt@...nel.org>,
"krzysztof.kozlowski+dt@...aro.org"
<krzysztof.kozlowski+dt@...aro.org>
CC: "linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
"linux-mediatek@...ts.infradead.org"
<linux-mediatek@...ts.infradead.org>,
Singo Chang (張興國)
<Singo.Chang@...iatek.com>,
"devicetree@...r.kernel.org" <devicetree@...r.kernel.org>,
Jason-JH Lin (林睿祥)
<Jason-JH.Lin@...iatek.com>,
Nancy Lin (林欣螢) <Nancy.Lin@...iatek.com>,
"daniel@...ll.ch" <daniel@...ll.ch>,
"p.zabel@...gutronix.de" <p.zabel@...gutronix.de>,
"conor+dt@...nel.org" <conor+dt@...nel.org>,
"dri-devel@...ts.freedesktop.org" <dri-devel@...ts.freedesktop.org>,
Project_Global_Chrome_Upstream_Group
<Project_Global_Chrome_Upstream_Group@...iatek.com>,
"airlied@...il.com" <airlied@...il.com>,
"linux-arm-kernel@...ts.infradead.org"
<linux-arm-kernel@...ts.infradead.org>,
"nfraprado@...labora.com" <nfraprado@...labora.com>
Subject: Re: [RESEND PATCH v6 13/20] drm/mediatek: Sort OVL adaptor components
Hi, Hsiao-chien:
On Mon, 2023-09-11 at 15:42 +0800, Hsiao Chien Sung wrote:
> Sort OVL adaptor components' names in alphabetical order.
Reviewed-by: CK Hu <ck.hu@...iatek.com>
>
> Signed-off-by: Hsiao Chien Sung <shawn.sung@...iatek.com>
> ---
> .../gpu/drm/mediatek/mtk_disp_ovl_adaptor.c | 18 +++++++++-------
> --
> 1 file changed, 9 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/gpu/drm/mediatek/mtk_disp_ovl_adaptor.c
> b/drivers/gpu/drm/mediatek/mtk_disp_ovl_adaptor.c
> index 4a5fab5ea51f..72758e41b1e6 100644
> --- a/drivers/gpu/drm/mediatek/mtk_disp_ovl_adaptor.c
> +++ b/drivers/gpu/drm/mediatek/mtk_disp_ovl_adaptor.c
> @@ -27,13 +27,14 @@
> #define MTK_OVL_ADAPTOR_LAYER_NUM 4
>
> enum mtk_ovl_adaptor_comp_type {
> - OVL_ADAPTOR_TYPE_MDP_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,
> @@ -46,7 +47,6 @@ enum mtk_ovl_adaptor_comp_id {
> OVL_ADAPTOR_MERGE1,
> OVL_ADAPTOR_MERGE2,
> OVL_ADAPTOR_MERGE3,
> - OVL_ADAPTOR_ETHDR0,
> OVL_ADAPTOR_ID_MAX
> };
>
> @@ -62,12 +62,13 @@ struct mtk_disp_ovl_adaptor {
> };
>
> static const char * const private_comp_stem[OVL_ADAPTOR_TYPE_NUM] =
> {
> + [OVL_ADAPTOR_TYPE_ETHDR] = "ethdr",
> [OVL_ADAPTOR_TYPE_MDP_RDMA] = "vdo1-rdma",
> [OVL_ADAPTOR_TYPE_MERGE] = "merge",
> - [OVL_ADAPTOR_TYPE_ETHDR] = "ethdr",
> };
>
> static const struct ovl_adaptor_comp_match
> comp_matches[OVL_ADAPTOR_ID_MAX] = {
> + [OVL_ADAPTOR_ETHDR0] = { OVL_ADAPTOR_TYPE_ETHDR, 0 },
> [OVL_ADAPTOR_MDP_RDMA0] = { OVL_ADAPTOR_TYPE_MDP_RDMA, 0 },
> [OVL_ADAPTOR_MDP_RDMA1] = { OVL_ADAPTOR_TYPE_MDP_RDMA, 1 },
> [OVL_ADAPTOR_MDP_RDMA2] = { OVL_ADAPTOR_TYPE_MDP_RDMA, 2 },
> @@ -80,7 +81,6 @@ static const struct ovl_adaptor_comp_match
> comp_matches[OVL_ADAPTOR_ID_MAX] = {
> [OVL_ADAPTOR_MERGE1] = { OVL_ADAPTOR_TYPE_MERGE, 2 },
> [OVL_ADAPTOR_MERGE2] = { OVL_ADAPTOR_TYPE_MERGE, 3 },
> [OVL_ADAPTOR_MERGE3] = { OVL_ADAPTOR_TYPE_MERGE, 4 },
> - [OVL_ADAPTOR_ETHDR0] = { OVL_ADAPTOR_TYPE_ETHDR, 0 },
> };
>
> void mtk_ovl_adaptor_layer_config(struct device *dev, unsigned int
> idx,
> @@ -314,6 +314,7 @@ size_t mtk_ovl_adaptor_get_num_formats(struct
> device *dev)
>
> void mtk_ovl_adaptor_add_comp(struct device *dev, struct mtk_mutex
> *mutex)
> {
> + mtk_mutex_add_comp(mutex, DDP_COMPONENT_ETHDR_MIXER);
> mtk_mutex_add_comp(mutex, DDP_COMPONENT_MDP_RDMA0);
> mtk_mutex_add_comp(mutex, DDP_COMPONENT_MDP_RDMA1);
> mtk_mutex_add_comp(mutex, DDP_COMPONENT_MDP_RDMA2);
> @@ -326,11 +327,11 @@ void mtk_ovl_adaptor_add_comp(struct device
> *dev, struct mtk_mutex *mutex)
> mtk_mutex_add_comp(mutex, DDP_COMPONENT_MERGE2);
> mtk_mutex_add_comp(mutex, DDP_COMPONENT_MERGE3);
> mtk_mutex_add_comp(mutex, DDP_COMPONENT_MERGE4);
> - mtk_mutex_add_comp(mutex, DDP_COMPONENT_ETHDR_MIXER);
> }
>
> void mtk_ovl_adaptor_remove_comp(struct device *dev, struct
> mtk_mutex *mutex)
> {
> + mtk_mutex_remove_comp(mutex, DDP_COMPONENT_ETHDR_MIXER);
> mtk_mutex_remove_comp(mutex, DDP_COMPONENT_MDP_RDMA0);
> mtk_mutex_remove_comp(mutex, DDP_COMPONENT_MDP_RDMA1);
> mtk_mutex_remove_comp(mutex, DDP_COMPONENT_MDP_RDMA2);
> @@ -343,11 +344,11 @@ void mtk_ovl_adaptor_remove_comp(struct device
> *dev, struct mtk_mutex *mutex)
> mtk_mutex_remove_comp(mutex, DDP_COMPONENT_MERGE2);
> mtk_mutex_remove_comp(mutex, DDP_COMPONENT_MERGE3);
> mtk_mutex_remove_comp(mutex, DDP_COMPONENT_MERGE4);
> - mtk_mutex_remove_comp(mutex, DDP_COMPONENT_ETHDR_MIXER);
> }
>
> 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);
> @@ -355,11 +356,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);
> @@ -367,7 +368,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,
> --
> 2.18.0
>
Powered by blists - more mailing lists