| From c18e75f7097a1e6493af894a85fe49199642c88e Mon Sep 17 00:00:00 2001 |
| From: Yongqiang Niu <yongqiang.niu@mediatek.com> |
| Date: Sat, 10 Apr 2021 17:11:22 +0800 |
| Subject: [PATCH] FROMLIST: drm/mediatek: Add pm runtime support for ovl and |
| rdma |
| |
| 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> |
| (Yong: Use pm_runtime_resume_and_get instead of pm_runtime_get_sync) |
| Acked-by: Chun-Kuang Hu <chunkuang.hu@kernel.org> |
| |
| (am from https://patchwork.kernel.org/project/linux-mediatek/patch/20210410091128.31823-11-yong.wu@mediatek.com/) |
| |
| BUG=b:126008328 |
| TEST=boot krane |
| |
| Signed-off-by: Hsin-Yi Wang <hsinyi@chromium.org> |
| Change-Id: I7a34aca326f9addcc3035e669c562639fe9b6eba |
| Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/kernel/+/2866756 |
| Reviewed-by: Sean Paul <seanpaul@chromium.org> |
| Reviewed-by: Nicolas Boichat <drinkcat@chromium.org> |
| --- |
| drivers/gpu/drm/mediatek/mtk_disp_ovl.c | 8 +++++++- |
| drivers/gpu/drm/mediatek/mtk_disp_rdma.c | 9 ++++++++- |
| drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 12 +++++++++++- |
| 3 files changed, 26 insertions(+), 3 deletions(-) |
| |
| diff --git a/drivers/gpu/drm/mediatek/mtk_disp_ovl.c b/drivers/gpu/drm/mediatek/mtk_disp_ovl.c |
| --- 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_disp_drv.h" |
| @@ -414,9 +415,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; |
| } |
| @@ -424,6 +429,7 @@ static int mtk_disp_ovl_probe(struct platform_device *pdev) |
| 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 |
| --- 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_disp_drv.h" |
| @@ -327,9 +328,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; |
| } |
| @@ -338,6 +343,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 |
| --- a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c |
| +++ b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c |
| @@ -598,9 +598,15 @@ static void mtk_drm_crtc_atomic_enable(struct drm_crtc *crtc, |
| return; |
| } |
| |
| + ret = pm_runtime_resume_and_get(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; |
| } |
| |
| @@ -613,7 +619,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) |
| @@ -637,6 +643,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; |
| } |
| -- |
| 2.33.0.rc2.250.ged5fa647cd-goog |
| |