From: Tiffany Lin <tiffany.lin@mediatek.com>
To: CK Hu <ck.hu@mediatek.com>
Cc: Maoguang Meng <Maoguang.Meng@mediatek.com>,
Will Deacon <will.deacon@arm.com>,
youlin.pei@mediatek.com, Nicolas Boichat <drinkcat@chromium.org>,
Joerg Roedel <joro@8bytes.org>, Evan Green <evgreen@chromium.org>,
eizan@chromium.org, Matthias Kaehlcke <mka@chromium.org>,
linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org,
cui.zhang@mediatek.com, Tomasz Figa <tfiga@google.com>,
Rob Herring <robh+dt@kernel.org>,
linux-mediatek@lists.infradead.org,
Matthias Brugger <matthias.bgg@gmail.com>,
ming-fan.chen@mediatek.com, Yong Wu <yong.wu@mediatek.com>,
anan.sun@mediatek.com, acourbot@chromium.org,
srv_heupstream@mediatek.com, linux-kernel@vger.kernel.org,
chao.hao@mediatek.com, iommu@lists.linux-foundation.org,
Robin Murphy <robin.murphy@arm.com>
Subject: Re: [PATCH v4 09/17] media: mtk-vcodec: Get rid of mtk_smi_larb_get/put
Date: Wed, 10 Jun 2020 14:20:20 +0800 [thread overview]
Message-ID: <1591770020.5047.5.camel@mtksdaap41> (raw)
In-Reply-To: <1591768038.527.6.camel@mtksdaap41>
On Wed, 2020-06-10 at 13:47 +0800, CK Hu wrote:
> + Tiffany & Maoguang.
>
> On Sat, 2020-05-30 at 16:10 +0800, Yong Wu wrote:
> > MediaTek IOMMU has already added the device_link between the consumer
> > and smi-larb device. If the vcodec device call the pm_runtime_get_sync,
> > the smi-larb's pm_runtime_get_sync also be called automatically.
> >
Acked-by: Tiffany Lin <tiffany.lin@mediatek.com>
> > CC: Tiffany Lin <tiffany.lin@mediatek.com>
> > Signed-off-by: Yong Wu <yong.wu@mediatek.com>
> > Reviewed-by: Evan Green <evgreen@chromium.org>
> > ---
> > .../media/platform/mtk-vcodec/mtk_vcodec_dec_pm.c | 19 ---------------
> > drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h | 3 ---
> > drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c | 1 -
> > .../media/platform/mtk-vcodec/mtk_vcodec_enc_pm.c | 27 ----------------------
> > 4 files changed, 50 deletions(-)
> >
> > diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_pm.c b/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_pm.c
> > index 36dfe3f..1d7d14d 100644
> > --- a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_pm.c
> > +++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_pm.c
> > @@ -8,14 +8,12 @@
> > #include <linux/of_address.h>
> > #include <linux/of_platform.h>
> > #include <linux/pm_runtime.h>
> > -#include <soc/mediatek/smi.h>
> >
> > #include "mtk_vcodec_dec_pm.h"
> > #include "mtk_vcodec_util.h"
> >
> > int mtk_vcodec_init_dec_pm(struct mtk_vcodec_dev *mtkdev)
> > {
> > - struct device_node *node;
> > struct platform_device *pdev;
> > struct mtk_vcodec_pm *pm;
> > struct mtk_vcodec_clk *dec_clk;
> > @@ -26,18 +24,7 @@ int mtk_vcodec_init_dec_pm(struct mtk_vcodec_dev *mtkdev)
> > pm = &mtkdev->pm;
> > pm->mtkdev = mtkdev;
> > dec_clk = &pm->vdec_clk;
> > - node = of_parse_phandle(pdev->dev.of_node, "mediatek,larb", 0);
> > - if (!node) {
> > - mtk_v4l2_err("of_parse_phandle mediatek,larb fail!");
> > - return -1;
> > - }
> >
> > - pdev = of_find_device_by_node(node);
> > - of_node_put(node);
> > - if (WARN_ON(!pdev)) {
> > - return -1;
> > - }
> > - pm->larbvdec = &pdev->dev;
> > pdev = mtkdev->plat_dev;
> > pm->dev = &pdev->dev;
> >
> > @@ -113,11 +100,6 @@ void mtk_vcodec_dec_clock_on(struct mtk_vcodec_pm *pm)
> > }
> > }
> >
> > - ret = mtk_smi_larb_get(pm->larbvdec);
> > - if (ret) {
> > - mtk_v4l2_err("mtk_smi_larb_get larbvdec fail %d", ret);
> > - goto error;
> > - }
> > return;
> >
> > error:
> > @@ -130,7 +112,6 @@ void mtk_vcodec_dec_clock_off(struct mtk_vcodec_pm *pm)
> > struct mtk_vcodec_clk *dec_clk = &pm->vdec_clk;
> > int i = 0;
> >
> > - mtk_smi_larb_put(pm->larbvdec);
> > for (i = dec_clk->clk_num - 1; i >= 0; i--)
> > clk_disable_unprepare(dec_clk->clk_info[i].vcodec_clk);
> > }
> > diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h b/drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h
> > index 52d1ce1..7d3966a 100644
> > --- a/drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h
> > +++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h
> > @@ -190,10 +190,7 @@ struct mtk_vcodec_clk {
> > */
> > struct mtk_vcodec_pm {
> > struct mtk_vcodec_clk vdec_clk;
> > - struct device *larbvdec;
> > -
> > struct mtk_vcodec_clk venc_clk;
> > - struct device *larbvenc;
> > struct device *dev;
> > struct mtk_vcodec_dev *mtkdev;
> > };
> > diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c b/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c
> > index 5301dca..18025f7 100644
> > --- a/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c
> > +++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c
> > @@ -8,7 +8,6 @@
> > #include <media/v4l2-event.h>
> > #include <media/v4l2-mem2mem.h>
> > #include <media/videobuf2-dma-contig.h>
> > -#include <soc/mediatek/smi.h>
> > #include <linux/pm_runtime.h>
> >
> > #include "mtk_vcodec_drv.h"
> > diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_pm.c b/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_pm.c
> > index 01c6a55..047919e 100644
> > --- a/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_pm.c
> > +++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_pm.c
> > @@ -8,44 +8,25 @@
> > #include <linux/of_address.h>
> > #include <linux/of_platform.h>
> > #include <linux/pm_runtime.h>
> > -#include <soc/mediatek/smi.h>
> >
> > #include "mtk_vcodec_enc_pm.h"
> > #include "mtk_vcodec_util.h"
> >
> > int mtk_vcodec_init_enc_pm(struct mtk_vcodec_dev *mtkdev)
> > {
> > - struct device_node *node;
> > struct platform_device *pdev;
> > struct mtk_vcodec_pm *pm;
> > struct mtk_vcodec_clk *enc_clk;
> > struct mtk_vcodec_clk_info *clk_info;
> > int ret = 0, i = 0;
> > - struct device *dev;
> >
> > pdev = mtkdev->plat_dev;
> > pm = &mtkdev->pm;
> > memset(pm, 0, sizeof(struct mtk_vcodec_pm));
> > pm->mtkdev = mtkdev;
> > pm->dev = &pdev->dev;
> > - dev = &pdev->dev;
> > enc_clk = &pm->venc_clk;
> >
> > - node = of_parse_phandle(dev->of_node, "mediatek,larb", 0);
> > - if (!node) {
> > - mtk_v4l2_err("no mediatek,larb found");
> > - return -ENODEV;
> > - }
> > - pdev = of_find_device_by_node(node);
> > - of_node_put(node);
> > - if (!pdev) {
> > - mtk_v4l2_err("no mediatek,larb device found");
> > - return -ENODEV;
> > - }
> > - pm->larbvenc = &pdev->dev;
> > - pdev = mtkdev->plat_dev;
> > - pm->dev = &pdev->dev;
> > -
> > enc_clk->clk_num = of_property_count_strings(pdev->dev.of_node,
> > "clock-names");
> > if (enc_clk->clk_num > 0) {
> > @@ -93,13 +74,6 @@ void mtk_vcodec_enc_clock_on(struct mtk_vcodec_pm *pm)
> > }
> > }
> >
> > - ret = mtk_smi_larb_get(pm->larbvenc);
> > - if (ret) {
> > - mtk_v4l2_err("mtk_smi_larb_get larb3 fail %d", ret);
> > - goto clkerr;
> > - }
> > - return;
> > -
> > clkerr:
> > for (i -= 1; i >= 0; i--)
> > clk_disable_unprepare(enc_clk->clk_info[i].vcodec_clk);
> > @@ -110,7 +84,6 @@ void mtk_vcodec_enc_clock_off(struct mtk_vcodec_pm *pm)
> > struct mtk_vcodec_clk *enc_clk = &pm->venc_clk;
> > int i = 0;
> >
> > - mtk_smi_larb_put(pm->larbvenc);
> > for (i = enc_clk->clk_num - 1; i >= 0; i--)
> > clk_disable_unprepare(enc_clk->clk_info[i].vcodec_clk);
> > }
>
>
_______________________________________________
Linux-mediatek mailing list
Linux-mediatek@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-mediatek
next prev parent reply other threads:[~2020-06-10 6:30 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-30 8:10 [PATCH v4 00/17] Clean up "mediatek,larb" after adding device_link Yong Wu
2020-05-30 8:10 ` [PATCH v4 01/17] media: dt-binding: mtk-vcodec: Separating mtk-vcodec encode node Yong Wu
2020-06-09 21:21 ` Rob Herring
2020-06-10 6:46 ` Alexandre Courbot
2020-06-10 7:38 ` Tiffany Lin
2020-06-17 5:53 ` Tiffany Lin
2020-05-30 8:10 ` [PATCH v4 02/17] dt-binding: mediatek: Get rid of mediatek, larb for multimedia HW Yong Wu
2020-05-30 8:10 ` [PATCH v4 03/17] iommu/mediatek: Add probe_defer for smi-larb Yong Wu
2020-05-30 8:10 ` [PATCH v4 04/17] iommu/mediatek: Add device_link between the consumer and the larb devices Yong Wu
2020-05-30 8:10 ` [PATCH v4 05/17] memory: mtk-smi: Add device-link between smi-larb and smi-common Yong Wu
2020-05-30 8:10 ` [PATCH v4 06/17] media: mtk-jpeg: Get rid of mtk_smi_larb_get/put Yong Wu
2020-06-18 9:32 ` Yong Wu
2020-06-18 17:28 ` Rick Chang
2020-05-30 8:10 ` [PATCH v4 07/17] media: mtk-mdp: " Yong Wu
2020-05-30 8:10 ` [PATCH v4 08/17] media: mtk-vcodec: separate mtk-vcodec-enc node Yong Wu
2020-06-10 5:45 ` CK Hu
2020-06-10 6:13 ` Tiffany Lin
2020-05-30 8:10 ` [PATCH v4 09/17] media: mtk-vcodec: Get rid of mtk_smi_larb_get/put Yong Wu
2020-06-10 5:47 ` CK Hu
2020-06-10 6:20 ` Tiffany Lin [this message]
2020-05-30 8:10 ` [PATCH v4 10/17] drm/mediatek: Add pm runtime support for ovl and rdma Yong Wu
2020-05-30 11:07 ` Chun-Kuang Hu
2020-05-30 8:10 ` [PATCH v4 11/17] drm/mediatek: Get rid of mtk_smi_larb_get/put Yong Wu
2020-05-30 11:08 ` Chun-Kuang Hu
2020-05-30 8:10 ` [PATCH v4 12/17] memory: mtk-smi: " Yong Wu
2020-05-30 8:10 ` [PATCH v4 13/17] iommu/mediatek: Use module_platform_driver Yong Wu
2020-05-30 8:10 ` [PATCH v4 14/17] memory: mtk-smi: Use device_is_bound to check if smi-common is ready Yong Wu
2020-05-30 8:10 ` [PATCH v4 15/17] arm: dts: mediatek: Get rid of mediatek, larb for MM nodes Yong Wu
2020-05-30 8:10 ` [PATCH v4 16/17] arm64: dts: mt8173: Separate mtk-vcodec-enc node Yong Wu
2020-05-30 8:10 ` [PATCH v4 17/17] arm64: dts: mediatek: Get rid of mediatek, larb for MM nodes Yong Wu
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=1591770020.5047.5.camel@mtksdaap41 \
--to=tiffany.lin@mediatek.com \
--cc=Maoguang.Meng@mediatek.com \
--cc=acourbot@chromium.org \
--cc=anan.sun@mediatek.com \
--cc=chao.hao@mediatek.com \
--cc=ck.hu@mediatek.com \
--cc=cui.zhang@mediatek.com \
--cc=devicetree@vger.kernel.org \
--cc=drinkcat@chromium.org \
--cc=eizan@chromium.org \
--cc=evgreen@chromium.org \
--cc=iommu@lists.linux-foundation.org \
--cc=joro@8bytes.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=mka@chromium.org \
--cc=robh+dt@kernel.org \
--cc=robin.murphy@arm.com \
--cc=srv_heupstream@mediatek.com \
--cc=tfiga@google.com \
--cc=will.deacon@arm.com \
--cc=yong.wu@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).