From: Chun-Kuang Hu <chunkuang.hu@kernel.org>
To: Yong Wu <yong.wu@mediatek.com>
Cc: 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>,
CK Hu <ck.hu@mediatek.com>,
devicetree@vger.kernel.org, cui.zhang@mediatek.com,
Tomasz Figa <tfiga@google.com>, Rob Herring <robh+dt@kernel.org>,
"moderated list:ARM/Mediatek SoC support"
<linux-mediatek@lists.infradead.org>,
Matthias Brugger <matthias.bgg@gmail.com>,
ming-fan.chen@mediatek.com,
Linux ARM <linux-arm-kernel@lists.infradead.org>,
anan.sun@mediatek.com, acourbot@chromium.org,
srv_heupstream <srv_heupstream@mediatek.com>,
linux-kernel <linux-kernel@vger.kernel.org>,
chao.hao@mediatek.com, iommu@lists.linux-foundation.org,
Philipp Zabel <p.zabel@pengutronix.de>,
Robin Murphy <robin.murphy@arm.com>
Subject: Re: [PATCH v4 11/17] drm/mediatek: Get rid of mtk_smi_larb_get/put
Date: Sat, 30 May 2020 19:08:31 +0800 [thread overview]
Message-ID: <CAAOTY_-7ES_tdO4p7aSeVO3x+=0kzWVtCAve-EV_Mrj=WGEmGg@mail.gmail.com> (raw)
In-Reply-To: <1590826218-23653-12-git-send-email-yong.wu@mediatek.com>
Hi, Yong:
Yong Wu <yong.wu@mediatek.com> 於 2020年5月30日 週六 下午4:27寫道:
>
> MediaTek IOMMU has already added the device_link between the consumer
> and smi-larb device. If the drm device call the pm_runtime_get_sync,
> the smi-larb's pm_runtime_get_sync also be called automatically.
>
Acked-by: Chun-Kuang Hu <chunkuang.hu@kernel.org>
> CC: CK Hu <ck.hu@mediatek.com>
> CC: Philipp Zabel <p.zabel@pengutronix.de>
> Signed-off-by: Yong Wu <yong.wu@mediatek.com>
> Reviewed-by: Evan Green <evgreen@chromium.org>
> ---
> drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 9 ---------
> drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c | 21 ---------------------
> drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h | 1 -
> 3 files changed, 31 deletions(-)
>
> diff --git a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
> index c9bc844..d4c4078 100644
> --- a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
> +++ b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
> @@ -8,7 +8,6 @@
> #include <linux/soc/mediatek/mtk-cmdq.h>
>
> #include <asm/barrier.h>
> -#include <soc/mediatek/smi.h>
>
> #include <drm/drm_atomic_helper.h>
> #include <drm/drm_plane_helper.h>
> @@ -532,12 +531,6 @@ static void mtk_drm_crtc_atomic_enable(struct drm_crtc *crtc,
>
> DRM_DEBUG_DRIVER("%s %d\n", __func__, crtc->base.id);
>
> - ret = mtk_smi_larb_get(comp->larb_dev);
> - if (ret) {
> - DRM_ERROR("Failed to get larb: %d\n", ret);
> - return;
> - }
> -
> ret = pm_runtime_get_sync(comp->dev);
> if (ret < 0)
> DRM_DEV_ERROR(comp->dev, "Failed to enable power domain: %d\n",
> @@ -545,7 +538,6 @@ static void mtk_drm_crtc_atomic_enable(struct drm_crtc *crtc,
>
> ret = mtk_crtc_ddp_hw_init(mtk_crtc);
> if (ret) {
> - mtk_smi_larb_put(comp->larb_dev);
> pm_runtime_put(comp->dev);
> return;
> }
> @@ -582,7 +574,6 @@ static void mtk_drm_crtc_atomic_disable(struct drm_crtc *crtc,
>
> drm_crtc_vblank_off(crtc);
> mtk_crtc_ddp_hw_fini(mtk_crtc);
> - mtk_smi_larb_put(comp->larb_dev);
> ret = pm_runtime_put(comp->dev);
> if (ret < 0)
> DRM_DEV_ERROR(comp->dev, "Failed to disable power domain: %d\n",
> diff --git a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c
> index 593027a..a6e7f3a 100644
> --- a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c
> +++ b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c
> @@ -432,8 +432,6 @@ int mtk_ddp_comp_init(struct device *dev, struct device_node *node,
> const struct mtk_ddp_comp_funcs *funcs)
> {
> enum mtk_ddp_comp_type type;
> - struct device_node *larb_node;
> - struct platform_device *larb_pdev;
> #if IS_REACHABLE(CONFIG_MTK_CMDQ)
> struct resource res;
> struct cmdq_client_reg cmdq_reg;
> @@ -468,31 +466,12 @@ int mtk_ddp_comp_init(struct device *dev, struct device_node *node,
> if (IS_ERR(comp->clk))
> return PTR_ERR(comp->clk);
>
> - /* Only DMA capable components need the LARB property */
> - comp->larb_dev = NULL;
> if (type != MTK_DISP_OVL &&
> type != MTK_DISP_OVL_2L &&
> type != MTK_DISP_RDMA &&
> type != MTK_DISP_WDMA)
> 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);
> - return -EINVAL;
> - }
> -
> - 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);
> - return -EPROBE_DEFER;
> - }
> - of_node_put(larb_node);
> -
> - comp->larb_dev = &larb_pdev->dev;
> -
> comp->dev = dev;
>
> #if IS_REACHABLE(CONFIG_MTK_CMDQ)
> diff --git a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h
> index 4c063e0..11c7120 100644
> --- a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h
> +++ b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h
> @@ -98,7 +98,6 @@ struct mtk_ddp_comp {
> struct clk *clk;
> void __iomem *regs;
> int irq;
> - struct device *larb_dev;
> struct device *dev;
> enum mtk_ddp_comp_id id;
> const struct mtk_ddp_comp_funcs *funcs;
> --
> 1.9.1
> _______________________________________________
> Linux-mediatek mailing list
> Linux-mediatek@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-mediatek
_______________________________________________
Linux-mediatek mailing list
Linux-mediatek@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-mediatek
next prev parent reply other threads:[~2020-05-30 11:09 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
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 [this message]
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='CAAOTY_-7ES_tdO4p7aSeVO3x+=0kzWVtCAve-EV_Mrj=WGEmGg@mail.gmail.com' \
--to=chunkuang.hu@kernel.org \
--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=p.zabel@pengutronix.de \
--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).