media: drm/mediatek: Add pm runtime support for ovl and rdma

Prepare for smi cleaning up "mediatek,larb".

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.

(Yong: Use pm_runtime_resume_and_get instead of pm_runtime_get_sync)

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>
Acked-by: Chun-Kuang Hu <chunkuang.hu@kernel.org>
Tested-by: Frank Wunderlich <frank-w@public-files.de> # BPI-R2/MT7623
Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>

diff --git a/drivers/gpu/drm/mediatek/mtk_disp_ovl.c b/drivers/gpu/drm/mediatek/mtk_disp_ovl.c
index 2146299e5f524a3e133e36015d2e413e1c3fc99f..17cd9b932298814236580dd427fe4f0b00304b78 100644 (file)
--- 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
index d41a3970b944f1ff4b9026ac631b6104c7a571f3..662e91d9d45f6f23740868ad793bbbd29e2ab63b 100644 (file)
--- 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
index d661edf7e0fe8849836b5fad88fdcacdc876d273..8847d8c93d8ae2a4b4ad41e3c255d0721b86302e 100644 (file)
--- a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
+++ b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
@@ -667,9 +667,17 @@ static void mtk_drm_crtc_atomic_enable(struct drm_crtc *crtc,
                return;
        }
 
+       ret = pm_runtime_resume_and_get(comp->dev);
+       if (ret < 0) {
+               mtk_smi_larb_put(comp->larb_dev);
+               DRM_DEV_ERROR(comp->dev, "Failed to enable power domain: %d\n", ret);
+               return;
+       }
+
        ret = mtk_crtc_ddp_hw_init(mtk_crtc);
        if (ret) {
                mtk_smi_larb_put(comp->larb_dev);
+               pm_runtime_put(comp->dev);
                return;
        }
 
@@ -682,7 +690,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)
@@ -706,6 +714,9 @@ 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;
 }