media: ipu3-cio2: Toggle sensor streaming in pm runtime ops
authorDaniel Scally <djrscally@gmail.com>
Mon, 22 Nov 2021 23:56:11 +0000 (00:56 +0100)
committerMauro Carvalho Chehab <mchehab+huawei@kernel.org>
Tue, 30 Nov 2021 09:47:47 +0000 (10:47 +0100)
The .suspend() and .resume() runtime_pm operations for the ipu3-cio2
driver currently do not handle the sensor's stream. Setting .s_stream() on
or off for the sensor subdev means that sensors will pause and resume the
stream at the appropriate time even if their drivers don't implement those
operations.

Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Signed-off-by: Daniel Scally <djrscally@gmail.com>
Tested-by: Jean-Michel Hautbois <jeanmichel.hautbois@ideasonboard.com>
Reviewed-by: Jean-Michel Hautbois <jeanmichel.hautbois@ideasonboard.com>
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
drivers/media/pci/intel/ipu3/ipu3-cio2-main.c

index 356ea966cf8daba6a1ca9b3e5538d7a9c25dce90..e2874fee9530130a0ba1d72027d1edff31f018b9 100644 (file)
@@ -1966,12 +1966,19 @@ static int __maybe_unused cio2_suspend(struct device *dev)
        struct pci_dev *pci_dev = to_pci_dev(dev);
        struct cio2_device *cio2 = pci_get_drvdata(pci_dev);
        struct cio2_queue *q = cio2->cur_queue;
+       int r;
 
        dev_dbg(dev, "cio2 suspend\n");
        if (!cio2->streaming)
                return 0;
 
        /* Stop stream */
+       r = v4l2_subdev_call(q->sensor, video, s_stream, 0);
+       if (r) {
+               dev_err(dev, "failed to stop sensor streaming\n");
+               return r;
+       }
+
        cio2_hw_exit(cio2, q);
        synchronize_irq(pci_dev->irq);
 
@@ -2005,8 +2012,16 @@ static int __maybe_unused cio2_resume(struct device *dev)
        }
 
        r = cio2_hw_init(cio2, q);
-       if (r)
+       if (r) {
                dev_err(dev, "fail to init cio2 hw\n");
+               return r;
+       }
+
+       r = v4l2_subdev_call(q->sensor, video, s_stream, 1);
+       if (r) {
+               dev_err(dev, "fail to start sensor streaming\n");
+               cio2_hw_exit(cio2, q);
+       }
 
        return r;
 }