From: Jai Luthra <j-luthra@ti.com>
To: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>,
Mauro Carvalho Chehab <mchehab@kernel.org>,
Sakari Ailus <sakari.ailus@linux.intel.com>,
Hans Verkuil <hverkuil-cisco@xs4all.nl>,
Vaishnav Achath <vaishnav.a@ti.com>,
Maxime Ripard <mripard@kernel.org>, Rob Herring <robh@kernel.org>,
Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>,
Conor Dooley <conor+dt@kernel.org>
Cc: <linux-media@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
<devicetree@vger.kernel.org>,
Vignesh Raghavendra <vigneshr@ti.com>,
Aradhya Bhatia <a-bhatia1@ti.com>,
Devarsh Thakkar <devarsht@ti.com>,
Changhuang Liang <changhuang.liang@starfivetech.com>,
Jack Zhu <jack.zhu@starfivetech.com>,
Julien Massot <julien.massot@collabora.com>,
Jayshri Pawar <jpawar@cadence.com>, Jai Luthra <j-luthra@ti.com>
Subject: [PATCH RFC 19/21] SQUASH: media: ti: j721e-csi2rx: Enable per-stream controls
Date: Thu, 22 Feb 2024 17:01:35 +0530 [thread overview]
Message-ID: <20240222-multistream-v1-19-1837ed916eeb@ti.com> (raw)
In-Reply-To: <20240222-multistream-v1-0-1837ed916eeb@ti.com>
Use the new enable_streams() APIs to start/stop individual streams on
the connected subdev when capture is initiated on the corresponding v4l2
device.
Signed-off-by: Jai Luthra <j-luthra@ti.com>
---
.../media/platform/ti/j721e-csi2rx/j721e-csi2rx.c | 78 ++++++++++++++--------
1 file changed, 52 insertions(+), 26 deletions(-)
diff --git a/drivers/media/platform/ti/j721e-csi2rx/j721e-csi2rx.c b/drivers/media/platform/ti/j721e-csi2rx/j721e-csi2rx.c
index b33681e1e2db..c2d47507b3a7 100644
--- a/drivers/media/platform/ti/j721e-csi2rx/j721e-csi2rx.c
+++ b/drivers/media/platform/ti/j721e-csi2rx/j721e-csi2rx.c
@@ -983,7 +983,9 @@ static int ti_csi2rx_start_streaming(struct vb2_queue *vq, unsigned int count)
dma->state = TI_CSI2RX_DMA_ACTIVE;
spin_unlock_irqrestore(&dma->lock, flags);
- ret = v4l2_subdev_call(&csi->subdev, video, s_stream, 1);
+ ret = v4l2_subdev_enable_streams(&csi->subdev,
+ TI_CSI2RX_PAD_FIRST_SOURCE + ctx->idx,
+ BIT(0));
if (ret)
goto err_dma;
@@ -1011,7 +1013,10 @@ static void ti_csi2rx_stop_streaming(struct vb2_queue *vq)
writel(0, csi->shim + SHIM_CNTL);
writel(0, csi->shim + SHIM_DMACNTX(ctx->idx));
- ret = v4l2_subdev_call(&csi->subdev, video, s_stream, 0);
+ ret = v4l2_subdev_disable_streams(&csi->subdev,
+ TI_CSI2RX_PAD_FIRST_SOURCE + ctx->idx,
+ BIT(0));
+
if (ret)
dev_err(csi->dev, "Failed to stop subdev stream\n");
@@ -1126,36 +1131,60 @@ static int ti_csi2rx_sd_init_state(struct v4l2_subdev *sd,
return _ti_csi2rx_sd_set_routing(sd, state, &routing);
}
-static int ti_csi2rx_sd_s_stream(struct v4l2_subdev *sd, int enable)
+static int ti_csi2rx_sd_enable_streams(struct v4l2_subdev *sd,
+ struct v4l2_subdev_state *state,
+ u32 pad, u64 streams_mask)
{
struct ti_csi2rx_dev *csi = to_csi2rx_dev(sd);
+ struct media_pad *remote_pad;
+ u64 sink_streams;
int ret = 0;
- mutex_lock(&csi->mutex);
+ remote_pad = media_entity_remote_source_pad_unique(&csi->subdev.entity);
+ if (!remote_pad)
+ return -ENODEV;
+ sink_streams = v4l2_subdev_state_xlate_streams(state, pad,
+ TI_CSI2RX_PAD_SINK,
+ &streams_mask);
- if (enable) {
- if (csi->enable_count > 0) {
- csi->enable_count++;
- goto out;
- }
+ ret = v4l2_subdev_enable_streams(csi->source, remote_pad->index,
+ sink_streams);
+ if (ret)
+ return ret;
- ret = v4l2_subdev_call(csi->source, video, s_stream, 1);
- if (ret)
- goto out;
+ mutex_lock(&csi->mutex);
+ csi->enable_count++;
+ mutex_unlock(&csi->mutex);
- csi->enable_count++;
- } else {
- if (csi->enable_count == 0) {
- ret = -EINVAL;
- goto out;
- }
+ return 0;
+}
+
+static int ti_csi2rx_sd_disable_streams(struct v4l2_subdev *sd,
+ struct v4l2_subdev_state *state,
+ u32 pad, u64 streams_mask)
+{
+ struct ti_csi2rx_dev *csi = to_csi2rx_dev(sd);
+ struct media_pad *remote_pad;
+ u64 sink_streams;
+ int ret = 0;
- if (--csi->enable_count > 0)
- goto out;
+ remote_pad = media_entity_remote_source_pad_unique(&csi->subdev.entity);
+ if (!remote_pad)
+ return -ENODEV;
+ sink_streams = v4l2_subdev_state_xlate_streams(state, pad,
+ TI_CSI2RX_PAD_SINK,
+ &streams_mask);
- ret = v4l2_subdev_call(csi->source, video, s_stream, 0);
+ mutex_lock(&csi->mutex);
+ if (csi->enable_count == 0) {
+ ret = -EINVAL;
+ goto out;
}
+ ret = v4l2_subdev_disable_streams(csi->source, remote_pad->index,
+ sink_streams);
+ if (!ret)
+ --csi->enable_count;
out:
mutex_unlock(&csi->mutex);
return ret;
@@ -1165,14 +1194,11 @@ static const struct v4l2_subdev_pad_ops ti_csi2rx_subdev_pad_ops = {
.set_routing = ti_csi2rx_sd_set_routing,
.get_fmt = v4l2_subdev_get_fmt,
.set_fmt = ti_csi2rx_sd_set_fmt,
-};
-
-static const struct v4l2_subdev_video_ops ti_csi2rx_subdev_video_ops = {
- .s_stream = ti_csi2rx_sd_s_stream,
+ .enable_streams = ti_csi2rx_sd_enable_streams,
+ .disable_streams = ti_csi2rx_sd_disable_streams,
};
static const struct v4l2_subdev_ops ti_csi2rx_subdev_ops = {
- .video = &ti_csi2rx_subdev_video_ops,
.pad = &ti_csi2rx_subdev_pad_ops,
};
--
2.43.0
next prev parent reply other threads:[~2024-02-22 11:33 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-22 11:31 [PATCH RFC 00/21] media: cadence,ti: CSI2RX Multistream Support Jai Luthra
2024-02-22 11:31 ` [PATCH RFC 01/21] media: ti: j721e-csi2rx: Fix races while restarting DMA Jai Luthra
2024-02-22 11:31 ` [PATCH RFC 02/21] media: cadence: csi2rx: configure DPHY before starting source stream Jai Luthra
2024-02-22 14:29 ` Julien Massot
2024-02-23 7:23 ` Jai Luthra
2024-02-23 2:46 ` 回复: " Changhuang Liang
2024-02-22 11:31 ` [PATCH RFC 03/21] media: cadence: csi2rx: Support runtime PM Jai Luthra
2024-03-22 9:26 ` 回复: " Changhuang Liang
2024-03-22 11:13 ` Jai Luthra
2024-02-22 11:31 ` [PATCH RFC 04/21] dt-bindings: media: ti,j721e-csi2rx-shim: Support 32 dma chans Jai Luthra
2024-02-22 12:25 ` Rob Herring
2024-02-23 7:44 ` Jai Luthra
2024-02-22 11:31 ` [PATCH RFC 05/21] media: ti: j721e-csi2rx: separate out device and context Jai Luthra
2024-02-22 11:31 ` [PATCH RFC 06/21] media: ti: j721e-csi2rx: prepare SHIM code for multiple contexts Jai Luthra
2024-02-22 11:31 ` [PATCH RFC 07/21] media: ti: j721e-csi2rx: allocate DMA channel based on context index Jai Luthra
2024-02-22 11:31 ` [PATCH RFC 08/21] media: ti: j721e-csi2rx: add a subdev for the core device Jai Luthra
2024-02-22 11:31 ` [PATCH RFC 09/21] SQUASH: media: ti: j721e-csi2rx: Fix link validation for multi-stream Jai Luthra
2024-02-22 11:31 ` [PATCH RFC 10/21] media: ti: j721e-csi2rx: get number of contexts from device tree Jai Luthra
2024-02-22 11:31 ` [PATCH RFC 11/21] media: cadence: csi2rx: add get_frame_desc wrapper Jai Luthra
2024-02-22 11:31 ` [PATCH RFC 12/21] media: ti: j721e-csi2rx: add support for processing virtual channels Jai Luthra
2024-02-22 11:31 ` [PATCH RFC 13/21] media: cadence: csi2rx: Use new enable stream APIs Jai Luthra
2024-02-22 11:31 ` [PATCH RFC 14/21] media: cadence: csi2rx: Enable stream-wise routing Jai Luthra
2024-02-22 11:31 ` [PATCH RFC 15/21] SQUASH: media: cadence: csi2rx: Enable per-stream controls Jai Luthra
2024-02-22 11:31 ` [PATCH RFC 16/21] SQUASH: media: cadence: csi2rx: Filter using MIPI virtual channels Jai Luthra
2024-02-22 11:31 ` [PATCH RFC 17/21] SQUASH: media: cadence: csi2rx: Filter streams in get_frame_desc Jai Luthra
2024-02-22 11:31 ` [PATCH RFC 18/21] media: ti: j721e-csi2rx: add multistream support Jai Luthra
2024-02-22 11:31 ` Jai Luthra [this message]
2024-02-22 11:31 ` [PATCH RFC 20/21] SQUASH: media: ti: j721e-csi2rx: Assert pixel reset before stopping last stream Jai Luthra
2024-02-22 11:31 ` [PATCH RFC 21/21] media: ti: j721e-csi2rx: Submit all available buffers Jai Luthra
2024-02-23 2:53 ` 回复: [PATCH RFC 00/21] media: cadence,ti: CSI2RX Multistream Support Changhuang Liang
2024-02-23 7:49 ` Jai Luthra
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=20240222-multistream-v1-19-1837ed916eeb@ti.com \
--to=j-luthra@ti.com \
--cc=a-bhatia1@ti.com \
--cc=changhuang.liang@starfivetech.com \
--cc=conor+dt@kernel.org \
--cc=devarsht@ti.com \
--cc=devicetree@vger.kernel.org \
--cc=hverkuil-cisco@xs4all.nl \
--cc=jack.zhu@starfivetech.com \
--cc=jpawar@cadence.com \
--cc=julien.massot@collabora.com \
--cc=krzysztof.kozlowski+dt@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=mchehab@kernel.org \
--cc=mripard@kernel.org \
--cc=robh@kernel.org \
--cc=sakari.ailus@linux.intel.com \
--cc=tomi.valkeinen@ideasonboard.com \
--cc=vaishnav.a@ti.com \
--cc=vigneshr@ti.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).