From: Benoit Parrot <bparrot@ti.com>
To: Hans Verkuil <hverkuil@xs4all.nl>,
Sakari Ailus <sakari.ailus@linux.intel.com>,
Rob Herring <robh+dt@kernel.org>
Cc: <linux-media@vger.kernel.org>, <devicetree@vger.kernel.org>,
<linux-kernel@vger.kernel.org>, Benoit Parrot <bparrot@ti.com>
Subject: [RESEND Patch v3 16/20] media: ti-vpe: cal: Add subdev s_power hooks
Date: Tue, 12 Nov 2019 08:53:43 -0600 [thread overview]
Message-ID: <20191112145347.23519-17-bparrot@ti.com> (raw)
In-Reply-To: <20191112145347.23519-1-bparrot@ti.com>
Because V4L2 still uses a specific way to manage power state of devices
that predates runtime PM, bridge driver should power on and off sub
device explicitly.
Signed-off-by: Benoit Parrot <bparrot@ti.com>
---
drivers/media/platform/ti-vpe/cal.c | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/drivers/media/platform/ti-vpe/cal.c b/drivers/media/platform/ti-vpe/cal.c
index 58d2edc087fb..5b5ff32b6120 100644
--- a/drivers/media/platform/ti-vpe/cal.c
+++ b/drivers/media/platform/ti-vpe/cal.c
@@ -1654,6 +1654,12 @@ static int cal_start_streaming(struct vb2_queue *vq, unsigned int count)
if (ret < 0)
goto err;
+ ret = v4l2_subdev_call(ctx->sensor, core, s_power, 1);
+ if (ret < 0 && ret != -ENOIOCTLCMD && ret != -ENODEV) {
+ ctx_err(ctx, "power on failed in subdev\n");
+ goto err;
+ }
+
cal_runtime_get(ctx->dev);
csi2_ctx_config(ctx);
@@ -1667,6 +1673,7 @@ static int cal_start_streaming(struct vb2_queue *vq, unsigned int count)
ret = v4l2_subdev_call(ctx->sensor, video, s_stream, 1);
if (ret) {
+ v4l2_subdev_call(ctx->sensor, core, s_power, 0);
ctx_err(ctx, "stream on failed in subdev\n");
cal_runtime_put(ctx->dev);
goto err;
@@ -1695,6 +1702,7 @@ static void cal_stop_streaming(struct vb2_queue *vq)
struct cal_dmaqueue *dma_q = &ctx->vidq;
struct cal_buffer *buf, *tmp;
unsigned long flags;
+ int ret;
csi2_ppi_disable(ctx);
disable_irqs(ctx);
@@ -1703,6 +1711,10 @@ static void cal_stop_streaming(struct vb2_queue *vq)
if (v4l2_subdev_call(ctx->sensor, video, s_stream, 0))
ctx_err(ctx, "stream off failed in subdev\n");
+ ret = v4l2_subdev_call(ctx->sensor, core, s_power, 0);
+ if (ret < 0 && ret != -ENOIOCTLCMD && ret != -ENODEV)
+ ctx_err(ctx, "power off failed in subdev\n");
+
/* Release all active buffers */
spin_lock_irqsave(&ctx->slock, flags);
list_for_each_entry_safe(buf, tmp, &dma_q->active, list) {
--
2.17.1
next prev parent reply other threads:[~2019-11-12 14:52 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-12 14:53 [RESEND Patch v3 00/20] media: ti-vpe: cal: maintenance Benoit Parrot
2019-11-12 14:53 ` [RESEND Patch v3 01/20] dt-bindings: media: cal: update binding to use syscon Benoit Parrot
2019-11-18 17:39 ` Rob Herring
2019-11-12 14:53 ` [RESEND Patch v3 02/20] dt-bindings: media: cal: update binding example Benoit Parrot
2019-11-18 17:40 ` Rob Herring
2019-11-12 14:53 ` [RESEND Patch v3 03/20] media: ti-vpe: cal: switch BIT_MASK to BIT Benoit Parrot
2019-11-12 14:53 ` [RESEND Patch v3 04/20] media: ti-vpe: cal: Add per platform data support Benoit Parrot
2019-11-12 14:53 ` [RESEND Patch v3 05/20] media: ti-vpe: cal: Enable DMABUF export Benoit Parrot
2019-11-12 14:53 ` [RESEND Patch v3 06/20] media: ti-vpe: cal: Restrict DMA to avoid memory corruption Benoit Parrot
2019-11-12 14:53 ` [RESEND Patch v3 07/20] dt-bindings: media: cal: update binding to add PHY LDO errata support Benoit Parrot
2019-11-12 14:53 ` [RESEND Patch v3 08/20] media: ti-vpe: cal: add CSI2 " Benoit Parrot
2019-11-12 14:53 ` [RESEND Patch v3 09/20] media: ti-vpe: cal: Fix ths_term/ths_settle parameters Benoit Parrot
2019-11-12 14:53 ` [RESEND Patch v3 10/20] media: ti-vpe: cal: Fix pixel processing parameters Benoit Parrot
2019-11-12 14:53 ` [RESEND Patch v3 11/20] media: ti-vpe: cal: Align DPHY init sequence with docs Benoit Parrot
2019-11-12 14:53 ` [RESEND Patch v3 12/20] dt-bindings: media: cal: update binding to add DRA76x support Benoit Parrot
2019-11-12 14:53 ` [RESEND Patch v3 13/20] media: ti-vpe: cal: Add " Benoit Parrot
2019-11-12 14:53 ` [RESEND Patch v3 14/20] dt-bindings: media: cal: update binding to add AM654 support Benoit Parrot
2019-11-12 14:53 ` [RESEND Patch v3 15/20] media: ti-vpe: cal: Add " Benoit Parrot
2019-11-12 14:53 ` Benoit Parrot [this message]
2019-11-12 14:53 ` [RESEND Patch v3 17/20] media: ti-vpe: cal: Properly calculate max resolution boundary Benoit Parrot
2019-11-12 14:53 ` [RESEND Patch v3 18/20] media: ti-vpe: cal: Fix a WARN issued when start streaming fails Benoit Parrot
2019-11-12 14:53 ` [RESEND Patch v3 19/20] media: ti-vpe: cal: fix enum_mbus_code/frame_size subdev arguments Benoit Parrot
2019-11-12 14:53 ` [RESEND Patch v3 20/20] dt-bindings: media: cal: convert binding to yaml Benoit Parrot
2019-11-18 17:47 ` Rob Herring
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191112145347.23519-17-bparrot@ti.com \
--to=bparrot@ti.com \
--cc=devicetree@vger.kernel.org \
--cc=hverkuil@xs4all.nl \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=robh+dt@kernel.org \
--cc=sakari.ailus@linux.intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).