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>
Cc: Will Deacon <will.deacon@arm.com>,
youlin.pei@mediatek.com, Nicolas Boichat <drinkcat@chromium.org>,
Evan Green <evgreen@chromium.org>,
eizan@chromium.org, Matthias Kaehlcke <mka@chromium.org>,
linux-arm-kernel@lists.infradead.org,
Yongqiang Niu <yongqiang.niu@mediatek.com>,
CK Hu <ck.hu@mediatek.com>,
devicetree@vger.kernel.org, cui.zhang@mediatek.com,
Tomasz Figa <tfiga@google.com>,
linux-mediatek@lists.infradead.org, ming-fan.chen@mediatek.com,
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: [PATCH v4 10/17] drm/mediatek: Add pm runtime support for ovl and rdma
Date: Sat, 30 May 2020 16:10:11 +0800 [thread overview]
Message-ID: <1590826218-23653-11-git-send-email-yong.wu@mediatek.com> (raw)
In-Reply-To: <1590826218-23653-1-git-send-email-yong.wu@mediatek.com>
From: Yongqiang Niu <yongqiang.niu@mediatek.com>
Display use the dispsys device to call pm_rumtime_get_sync before.
This patch add pm_runtime_xx with ovl and rdma device whose nodes has
"iommus" property, then display could help pm_runtime_get for smi via
ovl or rdma device.
This is a preparing patch that smi cleaning up "mediatek,larb".
CC: CK Hu <ck.hu@mediatek.com>
Signed-off-by: Yongqiang Niu <yongqiang.niu@mediatek.com>
Signed-off-by: Yong Wu <yong.wu@mediatek.com>
---
drivers/gpu/drm/mediatek/mtk_disp_ovl.c | 9 ++++++++-
drivers/gpu/drm/mediatek/mtk_disp_rdma.c | 9 ++++++++-
drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 12 +++++++++++-
drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c | 2 ++
drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h | 1 +
5 files changed, 30 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/mediatek/mtk_disp_ovl.c b/drivers/gpu/drm/mediatek/mtk_disp_ovl.c
index 891d80c..17c9baa 100644
--- a/drivers/gpu/drm/mediatek/mtk_disp_ovl.c
+++ b/drivers/gpu/drm/mediatek/mtk_disp_ovl.c
@@ -11,6 +11,7 @@
#include <linux/of_device.h>
#include <linux/of_irq.h>
#include <linux/platform_device.h>
+#include <linux/pm_runtime.h>
#include <linux/soc/mediatek/mtk-cmdq.h>
#include "mtk_drm_crtc.h"
@@ -399,9 +400,13 @@ static int mtk_disp_ovl_probe(struct platform_device *pdev)
return ret;
}
+ pm_runtime_enable(dev);
+
ret = component_add(dev, &mtk_disp_ovl_component_ops);
- if (ret)
+ if (ret) {
+ pm_runtime_disable(dev);
dev_err(dev, "Failed to add component: %d\n", ret);
+ }
return ret;
}
@@ -410,6 +415,8 @@ static int mtk_disp_ovl_remove(struct platform_device *pdev)
{
component_del(&pdev->dev, &mtk_disp_ovl_component_ops);
+ pm_runtime_disable(&pdev->dev);
+
return 0;
}
diff --git a/drivers/gpu/drm/mediatek/mtk_disp_rdma.c b/drivers/gpu/drm/mediatek/mtk_disp_rdma.c
index 0cb848d..5ea8fb6 100644
--- a/drivers/gpu/drm/mediatek/mtk_disp_rdma.c
+++ b/drivers/gpu/drm/mediatek/mtk_disp_rdma.c
@@ -9,6 +9,7 @@
#include <linux/of_device.h>
#include <linux/of_irq.h>
#include <linux/platform_device.h>
+#include <linux/pm_runtime.h>
#include <linux/soc/mediatek/mtk-cmdq.h>
#include "mtk_drm_crtc.h"
@@ -313,9 +314,13 @@ static int mtk_disp_rdma_probe(struct platform_device *pdev)
platform_set_drvdata(pdev, priv);
+ pm_runtime_enable(dev);
+
ret = component_add(dev, &mtk_disp_rdma_component_ops);
- if (ret)
+ if (ret) {
+ pm_runtime_disable(dev);
dev_err(dev, "Failed to add component: %d\n", ret);
+ }
return ret;
}
@@ -324,6 +329,8 @@ static int mtk_disp_rdma_remove(struct platform_device *pdev)
{
component_del(&pdev->dev, &mtk_disp_rdma_component_ops);
+ pm_runtime_disable(&pdev->dev);
+
return 0;
}
diff --git a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
index fe85e48..c9bc844 100644
--- a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
+++ b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
@@ -538,9 +538,15 @@ static void mtk_drm_crtc_atomic_enable(struct drm_crtc *crtc,
return;
}
+ ret = pm_runtime_get_sync(comp->dev);
+ if (ret < 0)
+ DRM_DEV_ERROR(comp->dev, "Failed to enable power domain: %d\n",
+ ret);
+
ret = mtk_crtc_ddp_hw_init(mtk_crtc);
if (ret) {
mtk_smi_larb_put(comp->larb_dev);
+ pm_runtime_put(comp->dev);
return;
}
@@ -553,7 +559,7 @@ static void mtk_drm_crtc_atomic_disable(struct drm_crtc *crtc,
{
struct mtk_drm_crtc *mtk_crtc = to_mtk_crtc(crtc);
struct mtk_ddp_comp *comp = mtk_crtc->ddp_comp[0];
- int i;
+ int i, ret;
DRM_DEBUG_DRIVER("%s %d\n", __func__, crtc->base.id);
if (!mtk_crtc->enabled)
@@ -577,6 +583,10 @@ 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",
+ ret);
mtk_crtc->enabled = false;
}
diff --git a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c
index 57c88de..593027a 100644
--- a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c
+++ b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c
@@ -493,6 +493,8 @@ int mtk_ddp_comp_init(struct device *dev, struct device_node *node,
comp->larb_dev = &larb_pdev->dev;
+ comp->dev = dev;
+
#if IS_REACHABLE(CONFIG_MTK_CMDQ)
if (of_address_to_resource(node, 0, &res) != 0) {
dev_err(dev, "Missing reg in %s node\n", node->full_name);
diff --git a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h
index debe363..4c063e0 100644
--- a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h
+++ b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h
@@ -99,6 +99,7 @@ struct mtk_ddp_comp {
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;
resource_size_t regs_pa;
--
1.9.1
_______________________________________________
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 8:26 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 ` Yong Wu [this message]
2020-05-30 11:07 ` [PATCH v4 10/17] drm/mediatek: Add pm runtime support for ovl and rdma 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=1590826218-23653-11-git-send-email-yong.wu@mediatek.com \
--to=yong.wu@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=yongqiang.niu@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).