From: Yong Wu <yong.wu@mediatek.com>
To: Matthias Brugger <matthias.bgg@gmail.com>,
Joerg Roedel <joro@8bytes.org>, Rob Herring <robh+dt@kernel.org>,
Krzysztof Kozlowski <krzk@kernel.org>
Cc: Evan Green <evgreen@chromium.org>,
Robin Murphy <robin.murphy@arm.com>,
Tomasz Figa <tfiga@chromium.org>,
Will Deacon <will.deacon@arm.com>,
<linux-mediatek@lists.infradead.org>,
<srv_heupstream@mediatek.com>, <devicetree@vger.kernel.org>,
<linux-kernel@vger.kernel.org>,
<linux-arm-kernel@lists.infradead.org>,
<iommu@lists.linux-foundation.org>, <yong.wu@mediatek.com>,
<youlin.pei@mediatek.com>,
Nicolas Boichat <drinkcat@chromium.org>,
Matthias Kaehlcke <mka@chromium.org>, <anan.sun@mediatek.com>,
<chao.hao@mediatek.com>, <ming-fan.chen@mediatek.com>,
<yi.kuo@mediatek.com>, <eizan@chromium.org>,
<acourbot@chromium.org>,
Minghsiu Tsai <minghsiu.tsai@mediatek.com>,
"Houlong Wei" <houlong.wei@mediatek.com>
Subject: [PATCH v5 08/16] media: mtk-mdp: Get rid of mtk_smi_larb_get/put
Date: Sat, 10 Apr 2021 17:11:20 +0800 [thread overview]
Message-ID: <20210410091128.31823-9-yong.wu@mediatek.com> (raw)
In-Reply-To: <20210410091128.31823-1-yong.wu@mediatek.com>
MediaTek IOMMU has already added the device_link between the consumer
and smi-larb device. If the mdp device call the pm_runtime_get_sync,
the smi-larb's pm_runtime_get_sync also be called automatically.
CC: Minghsiu Tsai <minghsiu.tsai@mediatek.com>
CC: Houlong Wei <houlong.wei@mediatek.com>
Signed-off-by: Yong Wu <yong.wu@mediatek.com>
Reviewed-by: Evan Green <evgreen@chromium.org>
---
drivers/media/platform/mtk-mdp/mtk_mdp_comp.c | 40 -------------------
drivers/media/platform/mtk-mdp/mtk_mdp_comp.h | 2 -
drivers/media/platform/mtk-mdp/mtk_mdp_core.c | 1 -
3 files changed, 43 deletions(-)
diff --git a/drivers/media/platform/mtk-mdp/mtk_mdp_comp.c b/drivers/media/platform/mtk-mdp/mtk_mdp_comp.c
index b3426a551bea..1e3833f1c9ae 100644
--- a/drivers/media/platform/mtk-mdp/mtk_mdp_comp.c
+++ b/drivers/media/platform/mtk-mdp/mtk_mdp_comp.c
@@ -9,7 +9,6 @@
#include <linux/of.h>
#include <linux/of_address.h>
#include <linux/of_platform.h>
-#include <soc/mediatek/smi.h>
#include "mtk_mdp_comp.h"
@@ -18,14 +17,6 @@ void mtk_mdp_comp_clock_on(struct device *dev, struct mtk_mdp_comp *comp)
{
int i, err;
- if (comp->larb_dev) {
- err = mtk_smi_larb_get(comp->larb_dev);
- if (err)
- dev_err(dev,
- "failed to get larb, err %d. type:%d\n",
- err, comp->type);
- }
-
for (i = 0; i < ARRAY_SIZE(comp->clk); i++) {
if (IS_ERR(comp->clk[i]))
continue;
@@ -46,17 +37,12 @@ void mtk_mdp_comp_clock_off(struct device *dev, struct mtk_mdp_comp *comp)
continue;
clk_disable_unprepare(comp->clk[i]);
}
-
- if (comp->larb_dev)
- mtk_smi_larb_put(comp->larb_dev);
}
int mtk_mdp_comp_init(struct device *dev, struct device_node *node,
struct mtk_mdp_comp *comp,
enum mtk_mdp_comp_type comp_type)
{
- struct device_node *larb_node;
- struct platform_device *larb_pdev;
int ret;
int i;
@@ -77,32 +63,6 @@ int mtk_mdp_comp_init(struct device *dev, struct device_node *node,
break;
}
- /* Only DMA capable components need the LARB property */
- comp->larb_dev = NULL;
- if (comp->type != MTK_MDP_RDMA &&
- comp->type != MTK_MDP_WDMA &&
- comp->type != MTK_MDP_WROT)
- return 0;
-
- larb_node = of_parse_phandle(node, "mediatek,larb", 0);
- if (!larb_node) {
- dev_err(dev,
- "Missing mediadek,larb phandle in %pOF node\n", node);
- ret = -EINVAL;
- goto put_dev;
- }
-
- larb_pdev = of_find_device_by_node(larb_node);
- if (!larb_pdev) {
- dev_warn(dev, "Waiting for larb device %pOF\n", larb_node);
- of_node_put(larb_node);
- ret = -EPROBE_DEFER;
- goto put_dev;
- }
- of_node_put(larb_node);
-
- comp->larb_dev = &larb_pdev->dev;
-
return 0;
put_dev:
diff --git a/drivers/media/platform/mtk-mdp/mtk_mdp_comp.h b/drivers/media/platform/mtk-mdp/mtk_mdp_comp.h
index 1bf0242cce46..36bc1b8f6222 100644
--- a/drivers/media/platform/mtk-mdp/mtk_mdp_comp.h
+++ b/drivers/media/platform/mtk-mdp/mtk_mdp_comp.h
@@ -27,14 +27,12 @@ enum mtk_mdp_comp_type {
* @node: list node to track sibing MDP components
* @dev_node: component device node
* @clk: clocks required for component
- * @larb_dev: SMI device required for component
* @type: component type
*/
struct mtk_mdp_comp {
struct list_head node;
struct device_node *dev_node;
struct clk *clk[2];
- struct device *larb_dev;
enum mtk_mdp_comp_type type;
};
diff --git a/drivers/media/platform/mtk-mdp/mtk_mdp_core.c b/drivers/media/platform/mtk-mdp/mtk_mdp_core.c
index 976aa1f4829b..70a8eab16863 100644
--- a/drivers/media/platform/mtk-mdp/mtk_mdp_core.c
+++ b/drivers/media/platform/mtk-mdp/mtk_mdp_core.c
@@ -17,7 +17,6 @@
#include <linux/platform_device.h>
#include <linux/pm_runtime.h>
#include <linux/workqueue.h>
-#include <soc/mediatek/smi.h>
#include "mtk_mdp_core.h"
#include "mtk_mdp_m2m.h"
--
2.18.0
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2021-04-10 9:26 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-10 9:11 [PATCH v5 00/16] Clean up "mediatek,larb" Yong Wu
2021-04-10 9:11 ` [PATCH v5 01/16] dt-binding: mediatek: Get rid of mediatek, larb for multimedia HW Yong Wu
2021-04-10 9:11 ` [PATCH v5 02/16] iommu/mediatek: Add probe_defer for smi-larb Yong Wu
2021-04-10 9:11 ` [PATCH v5 03/16] iommu/mediatek: Add device_link between the consumer and the larb devices Yong Wu
2021-04-10 9:11 ` [PATCH v5 04/16] memory: mtk-smi: Add device-link between smi-larb and smi-common Yong Wu
2021-04-10 12:40 ` Krzysztof Kozlowski
2021-04-13 6:04 ` Yong Wu
2021-04-13 14:58 ` Krzysztof Kozlowski
2021-04-10 9:11 ` [PATCH v5 05/16] media: mtk-jpeg: Use pm_runtime_resume_and_get for PM get_sync Yong Wu
2021-06-09 13:38 ` Matthias Brugger
2021-04-10 9:11 ` [PATCH v5 06/16] media: mtk-jpeg: Get rid of mtk_smi_larb_get/put Yong Wu
2021-04-10 9:11 ` [PATCH v5 07/16] media: mtk-mdp: Use pm_runtime_resume_and_get for PM get_sync Yong Wu
2021-04-10 9:11 ` Yong Wu [this message]
2021-06-08 9:35 ` [PATCH v5 08/16] media: mtk-mdp: Get rid of mtk_smi_larb_get/put houlong wei
2021-04-10 9:11 ` [PATCH v5 09/16] drm/mediatek: Use pm_runtime_resume_and_get for PM get_sync Yong Wu
2021-06-09 13:52 ` Matthias Brugger
2021-04-10 9:11 ` [PATCH v5 10/16] drm/mediatek: Add pm runtime support for ovl and rdma Yong Wu
2021-04-10 9:11 ` [PATCH v5 11/16] drm/mediatek: Get rid of mtk_smi_larb_get/put Yong Wu
2021-05-26 5:41 ` Dafna Hirschfeld
2021-06-10 12:00 ` Yong Wu
2021-04-10 9:11 ` [PATCH v5 12/16] media: mtk-vcodec: Use pm_runtime_resume_and_get for PM get_sync Yong Wu
2021-04-10 9:11 ` [PATCH v5 13/16] media: mtk-vcodec: Get rid of mtk_smi_larb_get/put Yong Wu
2021-05-12 9:20 ` Hsin-Yi Wang
2021-05-12 12:29 ` Yong Wu
2021-06-10 7:53 ` Matthias Brugger
2021-06-10 12:02 ` Yong Wu
2021-06-11 10:07 ` Matthias Brugger
2021-06-11 10:46 ` Joerg Roedel
2021-04-10 9:11 ` [PATCH v5 14/16] memory: mtk-smi: " Yong Wu
2021-04-13 14:04 ` Krzysztof Kozlowski
2021-06-09 14:42 ` Matthias Brugger
2021-04-10 9:11 ` [PATCH v5 15/16] arm: dts: mediatek: Get rid of mediatek, larb for MM nodes Yong Wu
2021-04-10 9:11 ` [PATCH v5 16/16] arm64: " Yong Wu
2021-04-13 14:58 ` (subset) [PATCH v5 00/16] Clean up "mediatek,larb" Krzysztof Kozlowski
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=20210410091128.31823-9-yong.wu@mediatek.com \
--to=yong.wu@mediatek.com \
--cc=acourbot@chromium.org \
--cc=anan.sun@mediatek.com \
--cc=chao.hao@mediatek.com \
--cc=devicetree@vger.kernel.org \
--cc=drinkcat@chromium.org \
--cc=eizan@chromium.org \
--cc=evgreen@chromium.org \
--cc=houlong.wei@mediatek.com \
--cc=iommu@lists.linux-foundation.org \
--cc=joro@8bytes.org \
--cc=krzk@kernel.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=ming-fan.chen@mediatek.com \
--cc=minghsiu.tsai@mediatek.com \
--cc=mka@chromium.org \
--cc=robh+dt@kernel.org \
--cc=robin.murphy@arm.com \
--cc=srv_heupstream@mediatek.com \
--cc=tfiga@chromium.org \
--cc=will.deacon@arm.com \
--cc=yi.kuo@mediatek.com \
--cc=youlin.pei@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).