From: Eizan Miyamoto <eizan@chromium.org>
To: linux-kernel@vger.kernel.org
Cc: wenst@chromium.org, chunkuang.hu@kernel.org,
yong.wu@mediatek.com, enric.balletbo@collabora.com,
houlong.wei@mediatek.com, Eizan Miyamoto <eizan@chromium.org>,
Andrew-CT Chen <andrew-ct.chen@mediatek.com>,
Matthias Brugger <matthias.bgg@gmail.com>,
Mauro Carvalho Chehab <mchehab@kernel.org>,
Minghsiu Tsai <minghsiu.tsai@mediatek.com>,
linux-arm-kernel@lists.infradead.org,
linux-media@vger.kernel.org, linux-mediatek@lists.infradead.org
Subject: [PATCH v5 5/8] media: mtk-mdp: search for vpu node instead of linking it to a property
Date: Fri, 9 Jul 2021 12:23:21 +1000 [thread overview]
Message-ID: <20210709122040.v5.5.I0cbd6691d3edfa2757bd6f5de7acfce94b101480@changeid> (raw)
In-Reply-To: <20210709022324.1607884-1-eizan@chromium.org>
Since there is only one vpu node, it suffices to search for it instead
of having a link coded into the primary mdp device node.
Signed-off-by: Eizan Miyamoto <eizan@chromium.org>
---
(no changes since v1)
drivers/media/platform/mtk-mdp/mtk_mdp_comp.c | 6 ----
drivers/media/platform/mtk-mdp/mtk_mdp_core.c | 28 +++++++++++++------
2 files changed, 19 insertions(+), 15 deletions(-)
diff --git a/drivers/media/platform/mtk-mdp/mtk_mdp_comp.c b/drivers/media/platform/mtk-mdp/mtk_mdp_comp.c
index 0ee6c7d65664..8a9267d0da1e 100644
--- a/drivers/media/platform/mtk-mdp/mtk_mdp_comp.c
+++ b/drivers/media/platform/mtk-mdp/mtk_mdp_comp.c
@@ -127,12 +127,6 @@ static int mtk_mdp_comp_bind(struct device *dev, struct device *master,
if (vpu_node) {
int ret;
- mdp->vpu_dev = of_find_device_by_node(vpu_node);
- if (WARN_ON(!mdp->vpu_dev)) {
- dev_err(dev, "vpu pdev failed\n");
- of_node_put(vpu_node);
- }
-
ret = v4l2_device_register(dev, &mdp->v4l2_dev);
if (ret) {
dev_err(dev, "Failed to register v4l2 device\n");
diff --git a/drivers/media/platform/mtk-mdp/mtk_mdp_core.c b/drivers/media/platform/mtk-mdp/mtk_mdp_core.c
index 9af3dc0e204a..74ef37eb50bd 100644
--- a/drivers/media/platform/mtk-mdp/mtk_mdp_core.c
+++ b/drivers/media/platform/mtk-mdp/mtk_mdp_core.c
@@ -114,6 +114,7 @@ static void release_of(struct device *dev, void *data)
static int mtk_mdp_master_bind(struct device *dev)
{
int status;
+ struct device_node *vpu_node;
struct mtk_mdp_dev *mdp = dev_get_drvdata(dev);
status = component_bind_all(dev, mdp);
@@ -122,15 +123,24 @@ static int mtk_mdp_master_bind(struct device *dev)
goto err_component_bind_all;
}
- if (mdp->vpu_dev) {
- int ret = vpu_wdt_reg_handler(mdp->vpu_dev, mtk_mdp_reset_handler, mdp,
- VPU_RST_MDP);
- if (ret) {
- dev_err(dev, "Failed to register reset handler\n");
- goto err_wdt_reg;
- }
- } else {
- dev_err(dev, "no vpu_dev found\n");
+ vpu_node = of_find_node_by_name(NULL, "vpu");
+ if (!vpu_node) {
+ dev_err(dev, "unable to find vpu node");
+ status = -ENODEV;
+ goto err_wdt_reg;
+ }
+
+ mdp->vpu_dev = of_find_device_by_node(vpu_node);
+ if (!mdp->vpu_dev) {
+ dev_err(dev, "unable to find vpu device");
+ status = -ENODEV;
+ goto err_wdt_reg;
+ }
+
+ status = vpu_wdt_reg_handler(mdp->vpu_dev, mtk_mdp_reset_handler, mdp, VPU_RST_MDP);
+ if (status) {
+ dev_err(dev, "Failed to register reset handler\n");
+ goto err_wdt_reg;
}
status = mtk_mdp_register_m2m_device(mdp);
--
2.32.0.93.g670b81a890-goog
_______________________________________________
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-09 2:26 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-09 2:23 [PATCH v5 0/8] Refactor MTK MDP driver into core/components Eizan Miyamoto
2021-07-09 2:23 ` [PATCH v5 1/8] mtk-mdp: add driver to probe mdp components Eizan Miyamoto
2021-07-12 10:11 ` Enric Balletbo i Serra
2021-07-09 2:23 ` [PATCH v5 2/8] mtk-mdp: use pm_runtime in MDP component driver Eizan Miyamoto
2021-07-12 10:12 ` Enric Balletbo i Serra
2021-07-09 2:23 ` [PATCH v5 3/8] media: mtk-mdp: don't pm_run_time_get/put for master comp in clock_on Eizan Miyamoto
2021-07-12 10:12 ` Enric Balletbo i Serra
2021-07-09 2:23 ` [PATCH v5 4/8] mtk-mdp: soc: mediatek: register mdp from mmsys Eizan Miyamoto
2021-07-12 10:12 ` Enric Balletbo i Serra
2021-07-09 2:23 ` Eizan Miyamoto [this message]
2021-07-09 2:23 ` [PATCH v5 6/8] media: mtk-mdp: propagate errors better in pm_suspend/resume Eizan Miyamoto
2021-07-12 10:12 ` Enric Balletbo i Serra
2021-07-09 2:23 ` [PATCH v5 7/8] media: mtk-mdp: use mdp-rdma0 alias to point to MDP master Eizan Miyamoto
2021-07-12 10:12 ` Enric Balletbo i Serra
2021-07-09 2:23 ` [PATCH v5 8/8] dts: mtk-mdp: remove mediatek, vpu property from primary MDP device Eizan Miyamoto
2021-07-12 10:13 ` [PATCH v5 8/8] dts: mtk-mdp: remove mediatek,vpu " Enric Balletbo i Serra
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=20210709122040.v5.5.I0cbd6691d3edfa2757bd6f5de7acfce94b101480@changeid \
--to=eizan@chromium.org \
--cc=andrew-ct.chen@mediatek.com \
--cc=chunkuang.hu@kernel.org \
--cc=enric.balletbo@collabora.com \
--cc=houlong.wei@mediatek.com \
--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=minghsiu.tsai@mediatek.com \
--cc=wenst@chromium.org \
--cc=yong.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).