media: platform: Improve the implementation of the system PM ops

Add v4l2_m2m_suspend() function call in mtk_jpeg_suspend() to make sure
that the current frame is processed completely before suspend.
Add v4l2_m2m_resume() function call in mtk_jpeg_resume() to unblock the
driver from scheduling next frame.

Reviewed-by: Tomasz Figa <tfiga@chromium.org>
Signed-off-by: Xia Jiang <xia.jiang@mediatek.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

diff --git a/drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c b/drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c
index 4fd3611310015a2b924c3c9ecfcfe76fb02e138d..20d311b631f6761baf6018c56ea8441f0c8bb12f 100644 (file)
--- a/drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c
+++ b/drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c
@@ -1207,24 +1207,22 @@ static __maybe_unused int mtk_jpeg_pm_resume(struct device *dev)
 
 static __maybe_unused int mtk_jpeg_suspend(struct device *dev)
 {
-       int ret;
-
-       if (pm_runtime_suspended(dev))
-               return 0;
+       struct mtk_jpeg_dev *jpeg = dev_get_drvdata(dev);
 
-       ret = mtk_jpeg_pm_suspend(dev);
-       return ret;
+       v4l2_m2m_suspend(jpeg->m2m_dev);
+       return pm_runtime_force_suspend(dev);
 }
 
 static __maybe_unused int mtk_jpeg_resume(struct device *dev)
 {
+       struct mtk_jpeg_dev *jpeg = dev_get_drvdata(dev);
        int ret;
 
-       if (pm_runtime_suspended(dev))
-               return 0;
-
-       ret = mtk_jpeg_pm_resume(dev);
+       ret = pm_runtime_force_resume(dev);
+       if (ret < 0)
+               return ret;
 
+       v4l2_m2m_resume(jpeg->m2m_dev);
        return ret;
 }