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>, <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>,
Laurent Pinchart <laurent.pinchart@ideasonboard.com>,
Jai Luthra <j-luthra@ti.com>
Subject: [PATCH v2 10/13] media: cadence: csi2rx: Use new enable stream APIs
Date: Thu, 27 Jun 2024 18:40:05 +0530 [thread overview]
Message-ID: <20240627-multistream-v2-10-6ae96c54c1c3@ti.com> (raw)
In-Reply-To: <20240627-multistream-v2-0-6ae96c54c1c3@ti.com>
The enable_streams() API in v4l2 supports passing a bitmask to enable
each pad/stream combination individually on any media subdev instead of
doing s_stream(1) to start all streams on the subdev at once.
This API is implemented by ds90ub960 driver (FPDLink deser) and thus the
caller (cdns-csi2x) is required to use it. For now we only enable
stream0.
Signed-off-by: Jai Luthra <j-luthra@ti.com>
---
drivers/media/platform/cadence/cdns-csi2rx.c | 18 ++++++++++++++++--
1 file changed, 16 insertions(+), 2 deletions(-)
diff --git a/drivers/media/platform/cadence/cdns-csi2rx.c b/drivers/media/platform/cadence/cdns-csi2rx.c
index b6054d62c799..2ec34fc9c524 100644
--- a/drivers/media/platform/cadence/cdns-csi2rx.c
+++ b/drivers/media/platform/cadence/cdns-csi2rx.c
@@ -222,10 +222,18 @@ static int csi2rx_configure_ext_dphy(struct csi2rx_priv *csi2rx)
static int csi2rx_start(struct csi2rx_priv *csi2rx)
{
unsigned int i;
+ struct media_pad *remote_pad;
unsigned long lanes_used = 0;
u32 reg;
int ret;
+ remote_pad = media_pad_remote_pad_first(&csi2rx->pads[CSI2RX_PAD_SINK]);
+ if (!remote_pad) {
+ dev_err(csi2rx->dev,
+ "Failed to find connected source\n");
+ return -ENODEV;
+ }
+
ret = clk_prepare_enable(csi2rx->p_clk);
if (ret)
return ret;
@@ -309,7 +317,8 @@ static int csi2rx_start(struct csi2rx_priv *csi2rx)
reset_control_deassert(csi2rx->sys_rst);
- ret = v4l2_subdev_call(csi2rx->source_subdev, video, s_stream, true);
+ ret = v4l2_subdev_enable_streams(csi2rx->source_subdev,
+ remote_pad->index, BIT(0));
if (ret)
goto err_disable_sysclk;
@@ -337,6 +346,7 @@ static int csi2rx_start(struct csi2rx_priv *csi2rx)
static void csi2rx_stop(struct csi2rx_priv *csi2rx)
{
+ struct media_pad *remote_pad;
unsigned int i;
u32 val;
int ret;
@@ -365,8 +375,12 @@ static void csi2rx_stop(struct csi2rx_priv *csi2rx)
reset_control_assert(csi2rx->p_rst);
clk_disable_unprepare(csi2rx->p_clk);
- if (v4l2_subdev_call(csi2rx->source_subdev, video, s_stream, false))
+ remote_pad = media_pad_remote_pad_first(&csi2rx->pads[CSI2RX_PAD_SINK]);
+ if (!remote_pad ||
+ v4l2_subdev_disable_streams(csi2rx->source_subdev,
+ remote_pad->index, BIT(0))) {
dev_warn(csi2rx->dev, "Couldn't disable our subdev\n");
+ }
if (csi2rx->dphy) {
writel(0, csi2rx->base + CSI2RX_DPHY_LANE_CTRL_REG);
--
2.43.0
next prev parent reply other threads:[~2024-06-27 13:10 UTC|newest]
Thread overview: 47+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-06-27 13:09 [PATCH v2 00/13] media: cadence,ti: CSI2RX Multistream Support Jai Luthra
2024-06-27 13:09 ` [PATCH v2 01/13] media: cadence: csi2rx: Support runtime PM Jai Luthra
2024-06-28 8:14 ` Tomi Valkeinen
2024-06-28 8:45 ` 回复: " Changhuang Liang
2024-06-28 9:39 ` Jai Luthra
2024-06-28 10:02 ` 回复: " Changhuang Liang
2024-06-28 9:38 ` Jai Luthra
2024-06-27 13:09 ` [PATCH v2 02/13] dt-bindings: media: ti,j721e-csi2rx-shim: Support 32 dma chans Jai Luthra
2024-06-28 10:42 ` Tomi Valkeinen
2024-07-01 7:49 ` Jai Luthra
2024-07-01 9:30 ` Krzysztof Kozlowski
2024-07-01 12:33 ` Jai Luthra
2024-06-27 13:09 ` [PATCH v2 03/13] media: ti: j721e-csi2rx: separate out device and context Jai Luthra
2024-07-12 13:35 ` Jacopo Mondi
2024-07-16 9:18 ` Jai Luthra
2024-06-27 13:09 ` [PATCH v2 04/13] media: ti: j721e-csi2rx: prepare SHIM code for multiple contexts Jai Luthra
2024-07-12 13:42 ` Jacopo Mondi
2024-06-27 13:10 ` [PATCH v2 05/13] media: ti: j721e-csi2rx: allocate DMA channel based on context index Jai Luthra
2024-07-12 13:48 ` Jacopo Mondi
2024-06-27 13:10 ` [PATCH v2 06/13] media: ti: j721e-csi2rx: add a subdev for the core device Jai Luthra
2024-07-12 14:18 ` Jacopo Mondi
2024-07-16 9:32 ` Jai Luthra
2024-07-16 9:43 ` Jacopo Mondi
2024-06-27 13:10 ` [PATCH v2 07/13] media: ti: j721e-csi2rx: get number of contexts from device tree Jai Luthra
2024-07-12 14:43 ` Jacopo Mondi
2024-07-16 9:33 ` Jai Luthra
2024-06-27 13:10 ` [PATCH v2 08/13] media: cadence: csi2rx: add get_frame_desc wrapper Jai Luthra
2024-07-12 14:48 ` Jacopo Mondi
2024-07-16 9:33 ` Jai Luthra
2024-06-27 13:10 ` [PATCH v2 09/13] media: ti: j721e-csi2rx: add support for processing virtual channels Jai Luthra
2024-07-12 15:01 ` Jacopo Mondi
2024-07-16 9:33 ` Jai Luthra
2024-07-19 9:21 ` Tomi Valkeinen
2024-06-27 13:10 ` Jai Luthra [this message]
2024-06-27 13:10 ` [PATCH v2 11/13] media: cadence: csi2rx: Enable multi-stream support Jai Luthra
2024-07-12 16:09 ` Jacopo Mondi
2024-07-16 9:34 ` Jai Luthra
2024-07-16 9:55 ` Jacopo Mondi
2024-07-19 9:15 ` Tomi Valkeinen
2024-06-27 13:10 ` [PATCH v2 12/13] media: ti: j721e-csi2rx: add multistream support Jai Luthra
2024-07-19 10:09 ` Tomi Valkeinen
2024-06-27 13:10 ` [PATCH v2 13/13] media: ti: j721e-csi2rx: Submit all available buffers Jai Luthra
2024-07-19 10:17 ` Tomi Valkeinen
2024-06-28 8:26 ` [PATCH v2 00/13] media: cadence,ti: CSI2RX Multistream Support Tomi Valkeinen
2024-06-28 9:35 ` Jai Luthra
2024-06-28 9:53 ` Tomi Valkeinen
2024-06-28 10:29 ` 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=20240627-multistream-v2-10-6ae96c54c1c3@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=julien.massot@collabora.com \
--cc=krzysztof.kozlowski+dt@linaro.org \
--cc=laurent.pinchart@ideasonboard.com \
--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).