From: Moudy Ho <moudy.ho@mediatek.com>
To: Mauro Carvalho Chehab <mchehab@kernel.org>,
Matthias Brugger <matthias.bgg@gmail.com>,
Hans Verkuil <hverkuil-cisco@xs4all.nl>,
Ping-Hsun Wu <ping-hsun.wu@mediatek.com>
Cc: <linux-kernel@vger.kernel.org>, <linux-media@vger.kernel.org>,
<linux-arm-kernel@lists.infradead.org>,
<linux-mediatek@lists.infradead.org>,
<Project_Global_Chrome_Upstream_Group@mediatek.com>,
Moudy Ho <moudy.ho@mediatek.com>
Subject: [PATCH v6 04/12] media: platform: mtk-mdp3: chip config split about subcomponents
Date: Wed, 8 Feb 2023 17:08:47 +0800 [thread overview]
Message-ID: <20230208090855.18934-5-moudy.ho@mediatek.com> (raw)
In-Reply-To: <20230208090855.18934-1-moudy.ho@mediatek.com>
Integrate subcomponent related information into specific config file for
further multi-chip compatibility.
Signed-off-by: Moudy Ho <moudy.ho@mediatek.com>
---
.../media/platform/mediatek/mdp3/mdp_cfg_data.c | 12 ++++++++++++
.../media/platform/mediatek/mdp3/mtk-mdp3-comp.c | 14 ++------------
.../media/platform/mediatek/mdp3/mtk-mdp3-core.h | 1 +
3 files changed, 15 insertions(+), 12 deletions(-)
diff --git a/drivers/media/platform/mediatek/mdp3/mdp_cfg_data.c b/drivers/media/platform/mediatek/mdp3/mdp_cfg_data.c
index af2e75acf119..159f5ecb9c1b 100644
--- a/drivers/media/platform/mediatek/mdp3/mdp_cfg_data.c
+++ b/drivers/media/platform/mediatek/mdp3/mdp_cfg_data.c
@@ -144,12 +144,24 @@ static const struct mdp_comp_data mt8183_mdp_comp_data[MDP_MAX_COMP_COUNT] = {
},
};
+static const struct of_device_id mt8183_sub_comp_dt_ids[] = {
+ {
+ .compatible = "mediatek,mt8183-mdp3-wdma",
+ .data = (void *)MDP_COMP_TYPE_PATH,
+ }, {
+ .compatible = "mediatek,mt8183-mdp3-wrot",
+ .data = (void *)MDP_COMP_TYPE_PATH,
+ },
+ {}
+};
+
const struct mtk_mdp_driver_data mt8183_mdp_driver_data = {
.mdp_probe_infra = mt8183_mdp_probe_infra,
.mdp_cfg = &mt8183_plat_cfg,
.mdp_mutex_table_idx = mt8183_mutex_idx,
.comp_data = mt8183_mdp_comp_data,
.comp_data_len = ARRAY_SIZE(mt8183_mdp_comp_data),
+ .mdp_sub_comp_dt_ids = mt8183_sub_comp_dt_ids,
};
s32 mdp_cfg_get_id_inner(struct mdp_dev *mdp_dev, enum mtk_mdp_comp_id id)
diff --git a/drivers/media/platform/mediatek/mdp3/mtk-mdp3-comp.c b/drivers/media/platform/mediatek/mdp3/mtk-mdp3-comp.c
index 1000b0ae3483..b65b708d0e3d 100644
--- a/drivers/media/platform/mediatek/mdp3/mtk-mdp3-comp.c
+++ b/drivers/media/platform/mediatek/mdp3/mtk-mdp3-comp.c
@@ -610,17 +610,6 @@ static const struct of_device_id mdp_comp_dt_ids[] = {
{}
};
-static const struct of_device_id mdp_sub_comp_dt_ids[] = {
- {
- .compatible = "mediatek,mt8183-mdp3-wdma",
- .data = (void *)MDP_COMP_TYPE_PATH,
- }, {
- .compatible = "mediatek,mt8183-mdp3-wrot",
- .data = (void *)MDP_COMP_TYPE_PATH,
- },
- {}
-};
-
static inline bool is_dma_capable(const enum mdp_comp_type type)
{
return (type == MDP_COMP_TYPE_RDMA ||
@@ -871,6 +860,7 @@ static int mdp_comp_sub_create(struct mdp_dev *mdp)
{
struct device *dev = &mdp->pdev->dev;
struct device_node *node, *parent;
+ const struct mtk_mdp_driver_data *data = mdp->mdp_data;
parent = dev->of_node->parent;
@@ -880,7 +870,7 @@ static int mdp_comp_sub_create(struct mdp_dev *mdp)
int id, alias_id;
struct mdp_comp *comp;
- of_id = of_match_node(mdp_sub_comp_dt_ids, node);
+ of_id = of_match_node(data->mdp_sub_comp_dt_ids, node);
if (!of_id)
continue;
if (!of_device_is_available(node)) {
diff --git a/drivers/media/platform/mediatek/mdp3/mtk-mdp3-core.h b/drivers/media/platform/mediatek/mdp3/mtk-mdp3-core.h
index 0c398ef75616..41eeba49fb42 100644
--- a/drivers/media/platform/mediatek/mdp3/mtk-mdp3-core.h
+++ b/drivers/media/platform/mediatek/mdp3/mtk-mdp3-core.h
@@ -56,6 +56,7 @@ struct mtk_mdp_driver_data {
const u32 *mdp_mutex_table_idx;
const struct mdp_comp_data *comp_data;
unsigned int comp_data_len;
+ const struct of_device_id *mdp_sub_comp_dt_ids;
};
struct mdp_dev {
--
2.18.0
next prev parent reply other threads:[~2023-02-08 9:09 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-08 9:08 [PATCH v6 00/12] Add support for multiple chips Moudy Ho
2023-02-08 9:08 ` [PATCH v6 01/12] media: platform: mtk-mdp3: fix potential frame size overflow in mdp_try_fmt_mplane() Moudy Ho
2023-02-08 9:08 ` [PATCH v6 02/12] media: platform: mtk-mdp3: add files for chip configuration Moudy Ho
2023-02-08 9:08 ` [PATCH v6 03/12] media: platform: mtk-mdp3: chip config split about component settings Moudy Ho
2023-02-08 9:08 ` Moudy Ho [this message]
2023-02-08 9:08 ` [PATCH v6 05/12] media: platform: mtk-mdp3: chip config split about color format Moudy Ho
2023-02-08 9:08 ` [PATCH v6 06/12] media: platform: mtk-mdp3: chip config split about resolution limitations Moudy Ho
2023-02-08 9:08 ` [PATCH v6 07/12] media: platform: mtk-mdp3: chip config split about pipe info Moudy Ho
2023-02-08 9:08 ` [PATCH v6 08/12] media: platform: mtk-mdp3: extend mdp_color format for compressed mode Moudy Ho
2023-02-08 9:08 ` [PATCH v6 09/12] media: platform: mtk-mdp3: dynamically allocate component clocks Moudy Ho
2023-02-08 9:08 ` [PATCH v6 10/12] media: platform: mtk-mdp3: Split general definitions used in MDP3 Moudy Ho
2023-02-08 9:08 ` [PATCH v6 11/12] media: platform: mtk-mdp3: decompose hardware-related information in shared memory Moudy Ho
2023-02-08 9:08 ` [PATCH v6 12/12] media: platform: mtk-mdp3: reconfigure " Moudy Ho
2023-03-21 13:29 ` [PATCH v6 00/12] Add support for multiple chips Hans Verkuil
2023-03-23 6:16 ` Moudy Ho (何宗原)
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=20230208090855.18934-5-moudy.ho@mediatek.com \
--to=moudy.ho@mediatek.com \
--cc=Project_Global_Chrome_Upstream_Group@mediatek.com \
--cc=hverkuil-cisco@xs4all.nl \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=linux-mediatek@lists.infradead.org \
--cc=matthias.bgg@gmail.com \
--cc=mchehab@kernel.org \
--cc=ping-hsun.wu@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).