media: apple: isp: Support system sleep

Signed-off-by: Eileen Yoon <eyn@gmx.com>

Author: eiln

drivers/media/platform/apple/isp/isp-drv.c

@@ -541,17 +541,42 @@ static const struct of_device_id apple_isp_of_match[] = {
 };
 MODULE_DEVICE_TABLE(of, apple_isp_of_match);
 
+static __maybe_unused int apple_isp_runtime_suspend(struct device *dev)
+{
+	/* RPM sleep is called when the V4L2 file handle is closed */
+	return 0;
+}
+
+static __maybe_unused int apple_isp_runtime_resume(struct device *dev)
+{
+	return 0;
+}
+
 static __maybe_unused int apple_isp_suspend(struct device *dev)
 {
+	struct apple_isp *isp = dev_get_drvdata(dev);
+
+	/* We must restore V4L2 context on system resume. If we were streaming
+	 * before, we (essentially) stop streaming and start streaming again.
+	 */
+	apple_isp_video_suspend(isp);
+
 	return 0;
 }
 
 static __maybe_unused int apple_isp_resume(struct device *dev)
 {
+	struct apple_isp *isp = dev_get_drvdata(dev);
+
+	apple_isp_video_resume(isp);
+
 	return 0;
 }
-DEFINE_RUNTIME_DEV_PM_OPS(apple_isp_pm_ops, apple_isp_suspend, apple_isp_resume,
-			  NULL);
+
+static const struct dev_pm_ops apple_isp_pm_ops = {
+	SYSTEM_SLEEP_PM_OPS(apple_isp_suspend, apple_isp_resume)
+	RUNTIME_PM_OPS(apple_isp_runtime_suspend, apple_isp_runtime_resume, NULL)
+};
 
 static struct platform_driver apple_isp_driver = {
 	.driver	= {

drivers/media/platform/apple/isp/isp-drv.h

@@ -270,6 +270,7 @@ struct isp_buffer {
 enum {
 	ISP_STATE_STREAMING,
 	ISP_STATE_LOGGING,
+	ISP_STATE_SLEEPING,
 };
 
 #ifdef APPLE_ISP_DEBUG

drivers/media/platform/apple/isp/isp-fw.c

@@ -42,8 +42,8 @@ static inline void isp_gpio_write32(struct apple_isp *isp, u32 reg, u32 val)
 	writel(val, isp->gpio + reg);
 }
 
-int apple_isp_power_up_domains(struct apple_isp *isp)
 static int apple_isp_power_up_domains(struct apple_isp *isp)
+{
 	int ret;
 
 	if (isp->pds_active)
@@ -65,8 +65,8 @@ static int apple_isp_power_up_domains(struct apple_isp *isp)
 	return 0;
 }
 
-void apple_isp_power_down_domains(struct apple_isp *isp)
 static void apple_isp_power_down_domains(struct apple_isp *isp)
+{
 	int ret;
 
 	if (!isp->pds_active)
@@ -270,7 +270,7 @@ static void isp_firmware_shutdown_stage1(struct apple_isp *isp)
 static int isp_firmware_boot_stage1(struct apple_isp *isp)
 {
 	int err, retries;
-	u32 val;
+	// u32 val;
 
 	err = apple_isp_power_up_domains(isp);
 	if (err < 0)
@@ -279,12 +279,19 @@ static int isp_firmware_boot_stage1(struct apple_isp *isp)
 
 	isp_gpio_write32(isp, ISP_GPIO_CLOCK_EN, 0x1);
 
+#if 0
+	/* This doesn't work well with system sleep */
 	val = isp_gpio_read32(isp, ISP_GPIO_1);
 	if (val == 0xfeedbabe) {
 		err = isp_reset_coproc(isp);
 		if (err < 0)
 			return err;
 	}
+#endif
+
+	err = isp_reset_coproc(isp);
+	if (err < 0)
+		return err;
 
 	isp_gpio_write32(isp, ISP_GPIO_0, 0x0);
 	isp_gpio_write32(isp, ISP_GPIO_1, 0x0);

drivers/media/platform/apple/isp/isp-v4l2.c

@@ -337,13 +337,10 @@ static void isp_vb2_buf_queue(struct vb2_buffer *vb)
 		isp_submit_buffers(isp);
 }
 
-static int isp_vb2_start_streaming(struct vb2_queue *q, unsigned int count)
+static int apple_isp_start_streaming(struct apple_isp *isp)
 {
-	struct apple_isp *isp = vb2_get_drv_priv(q);
 	int err;
 
-	isp->sequence = 0;
-
 	err = apple_isp_start_camera(isp);
 	if (err) {
 		dev_err(isp->dev, "failed to start camera: %d\n", err);
@@ -373,16 +370,55 @@ static int isp_vb2_start_streaming(struct vb2_queue *q, unsigned int count)
 	return err;
 }
 
-static void isp_vb2_stop_streaming(struct vb2_queue *q)
+static void apple_isp_stop_streaming(struct apple_isp *isp)
 {
-	struct apple_isp *isp = vb2_get_drv_priv(q);
-
 	clear_bit(ISP_STATE_STREAMING, &isp->state);
 	apple_isp_stop_capture(isp);
 	apple_isp_stop_camera(isp);
+}
+
+static int isp_vb2_start_streaming(struct vb2_queue *q, unsigned int count)
+{
+	struct apple_isp *isp = vb2_get_drv_priv(q);
+
+	isp->sequence = 0;
+
+	return apple_isp_start_streaming(isp);
+}
+
+static void isp_vb2_stop_streaming(struct vb2_queue *q)
+{
+	struct apple_isp *isp = vb2_get_drv_priv(q);
+
+	apple_isp_stop_streaming(isp);
 	isp_vb2_release_buffers(isp, VB2_BUF_STATE_ERROR);
 }
 
+int apple_isp_video_suspend(struct apple_isp *isp)
+{
+	/* Swap into STATE_SLEEPING as isp_vb2_buf_queue() submits on
+	 * STATE_STREAMING.
+	 */
+	if (test_bit(ISP_STATE_STREAMING, &isp->state)) {
+		/* Signal buffers to be recycled for clean shutdown */
+		isp_vb2_release_buffers(isp, VB2_BUF_STATE_QUEUED);
+		apple_isp_stop_streaming(isp);
+		set_bit(ISP_STATE_SLEEPING, &isp->state);
+	}
+
+	return 0;
+}
+
+int apple_isp_video_resume(struct apple_isp *isp)
+{
+	if (test_bit(ISP_STATE_SLEEPING, &isp->state)) {
+		clear_bit(ISP_STATE_SLEEPING, &isp->state);
+		apple_isp_start_streaming(isp);
+	}
+
+	return 0;
+}
+
 static const struct vb2_ops isp_vb2_ops = {
 	.queue_setup = isp_vb2_queue_setup,
 	.buf_init = isp_vb2_buf_init,

drivers/media/platform/apple/isp/isp-v4l2.h

@@ -10,4 +10,7 @@ int apple_isp_setup_video(struct apple_isp *isp);
 void apple_isp_remove_video(struct apple_isp *isp);
 int ipc_bt_handle(struct apple_isp *isp, struct isp_channel *chan);
 
+int apple_isp_video_suspend(struct apple_isp *isp);
+int apple_isp_video_resume(struct apple_isp *isp);
+
 #endif /* __ISP_V4L2_H__ */