media: nxp: imx8-isi: Add suspend/resume support for ISI mem2mem

Add suspend/resume support for ISI when work at memory to memory mode.

Link: https://lore.kernel.org/r/20250815-isi_m2m-v2-1-32e3720880cc@nxp.com
Signed-off-by: Guoniu Zhou <guoniu.zhou@nxp.com>
Reviewed-by: Frank Li <Frank.Li@nxp.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Hans Verkuil <hverkuil+cisco@kernel.org>

diff --git a/drivers/media/platform/nxp/imx8-isi/imx8-isi-core.c b/drivers/media/platform/nxp/imx8-isi/imx8-isi-core.c
index 981648a0311374597a033a7ecbf39f7b0b252cb0..adc8d9960bf0df87d4e475661a3439beaf5ce9f6 100644 (file)
--- a/drivers/media/platform/nxp/imx8-isi/imx8-isi-core.c
+++ b/drivers/media/platform/nxp/imx8-isi/imx8-isi-core.c
@@ -374,6 +374,8 @@ static int mxc_isi_pm_suspend(struct device *dev)
                mxc_isi_video_suspend(pipe);
        }
 
+       mxc_isi_m2m_suspend(&isi->m2m);
+
        return pm_runtime_force_suspend(dev);
 }
 
@@ -403,6 +405,12 @@ static int mxc_isi_pm_resume(struct device *dev)
                }
        }
 
+       ret = mxc_isi_m2m_resume(&isi->m2m);
+       if (ret) {
+               dev_err(dev, "Failed to resume ISI (%d) for m2m\n", ret);
+               err = ret;
+       }
+
        return err;
 }
 

diff --git a/drivers/media/platform/nxp/imx8-isi/imx8-isi-core.h b/drivers/media/platform/nxp/imx8-isi/imx8-isi-core.h
index 5789e54f9428f0815be8e7f9d6bb7fa847e3f095..e84af5127e4e7938e55e31b7063bee5e2cd4cb11 100644 (file)
--- a/drivers/media/platform/nxp/imx8-isi/imx8-isi-core.h
+++ b/drivers/media/platform/nxp/imx8-isi/imx8-isi-core.h
@@ -342,6 +342,8 @@ int mxc_isi_video_buffer_prepare(struct mxc_isi_dev *isi, struct vb2_buffer *vb2
 #ifdef CONFIG_VIDEO_IMX8_ISI_M2M
 int mxc_isi_m2m_register(struct mxc_isi_dev *isi, struct v4l2_device *v4l2_dev);
 int mxc_isi_m2m_unregister(struct mxc_isi_dev *isi);
+void mxc_isi_m2m_suspend(struct mxc_isi_m2m *m2m);
+int mxc_isi_m2m_resume(struct mxc_isi_m2m *m2m);
 #else
 static inline int mxc_isi_m2m_register(struct mxc_isi_dev *isi,
                                       struct v4l2_device *v4l2_dev)
@@ -352,6 +354,13 @@ static inline int mxc_isi_m2m_unregister(struct mxc_isi_dev *isi)
 {
        return 0;
 }
+static inline void mxc_isi_m2m_suspend(struct mxc_isi_m2m *m2m)
+{
+}
+static inline int mxc_isi_m2m_resume(struct mxc_isi_m2m *m2m)
+{
+       return 0;
+}
 #endif
 
 int mxc_isi_channel_acquire(struct mxc_isi_pipe *pipe,

diff --git a/drivers/media/platform/nxp/imx8-isi/imx8-isi-m2m.c b/drivers/media/platform/nxp/imx8-isi/imx8-isi-m2m.c
index e36781c5522e0a9d87584397185c996b8b0570ca..6bdd13b3048f1fc5c07528a73e25ab405ba795ed 100644 (file)
--- a/drivers/media/platform/nxp/imx8-isi/imx8-isi-m2m.c
+++ b/drivers/media/platform/nxp/imx8-isi/imx8-isi-m2m.c
@@ -730,6 +730,40 @@ static const struct v4l2_file_operations mxc_isi_m2m_fops = {
        .mmap           = v4l2_m2m_fop_mmap,
 };
 
+/* -----------------------------------------------------------------------------
+ * Suspend & resume
+ */
+
+void mxc_isi_m2m_suspend(struct mxc_isi_m2m *m2m)
+{
+       if (m2m->usage_count == 0)
+               return;
+
+       v4l2_m2m_suspend(m2m->m2m_dev);
+
+       if (m2m->chained_count > 0)
+               mxc_isi_channel_unchain(m2m->pipe);
+
+       mxc_isi_channel_disable(m2m->pipe);
+       mxc_isi_channel_put(m2m->pipe);
+}
+
+int mxc_isi_m2m_resume(struct mxc_isi_m2m *m2m)
+{
+       if (m2m->usage_count == 0)
+               return 0;
+
+       mxc_isi_channel_get(m2m->pipe);
+
+       if (m2m->chained_count > 0)
+               mxc_isi_channel_chain(m2m->pipe);
+
+       m2m->last_ctx = NULL;
+       v4l2_m2m_resume(m2m->m2m_dev);
+
+       return 0;
+}
+
 /* -----------------------------------------------------------------------------
  * Registration
  */