From: Sakari Ailus <sakari.ailus@linux.intel.com>
To: linux-media@vger.kernel.org
Cc: "Yan, Dongcheng" <dongcheng.yan@intel.com>,
Mehdi Djait <mehdi.djait@linux.intel.com>,
"Yu, Ong Hock" <ong.hock.yu@intel.com>,
"Ng, Khai Wen" <khai.wen.ng@intel.com>,
Antti Laakso <antti.laakso@linux.intel.com>,
"Bajpai, Manik" <manik.bajpai@intel.com>,
Divyamani Tripathi <divyamani.tripathi@intel.com>
Subject: [PATCH v2 09/21] media: ipu6: Start streaming once all streams have started, stop when not
Date: Thu, 17 Sep 2026 14:39:11 +0300 [thread overview]
Message-ID: <20260917113923.59004-10-sakari.ailus@linux.intel.com> (raw)
In-Reply-To: <20260917113923.59004-1-sakari.ailus@linux.intel.com>
For each virtual channel, start streaming once all buffer queues connected
via enabled routes have been set streaming, similarly stop when the first
queue is stopped.
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
---
drivers/media/pci/intel/ipu6/ipu6-isys-csi2.c | 107 +++++++++++++++++-
drivers/media/pci/intel/ipu6/ipu6-isys-csi2.h | 1 +
.../media/pci/intel/ipu6/ipu6-isys-queue.c | 7 +-
3 files changed, 105 insertions(+), 10 deletions(-)
diff --git a/drivers/media/pci/intel/ipu6/ipu6-isys-csi2.c b/drivers/media/pci/intel/ipu6/ipu6-isys-csi2.c
index f92577054d89..aa07fabb2afc 100644
--- a/drivers/media/pci/intel/ipu6/ipu6-isys-csi2.c
+++ b/drivers/media/pci/intel/ipu6/ipu6-isys-csi2.c
@@ -12,6 +12,7 @@
#include <linux/io.h>
#include <linux/minmax.h>
#include <linux/sprintf.h>
+#include <linux/string_choices.h>
#include <media/media-entity.h>
#include <media/v4l2-ctrls.h>
@@ -435,6 +436,89 @@ static int ipu7_isys_csi2_stream_enable(struct ipu6_isys_csi2 *csi2)
return 0;
}
+static bool ipu6_isys_csi2_streaming_change(struct ipu6_isys_subdev *asd,
+ struct v4l2_subdev_state *state,
+ u32 pad, u8 *vc, bool enable)
+{
+ u32 streams_enabled = 0, nodes_streaming = 0;
+ struct v4l2_subdev_route *route, *this_route = NULL;
+ struct v4l2_mbus_frame_desc desc = { 0 };
+ struct v4l2_mbus_frame_desc_entry *this_entry = NULL;
+ int ret;
+
+ for_each_active_route(&state->routing, this_route)
+ if (pad == this_route->source_pad)
+ break;
+ if (!this_route) {
+ dev_dbg(asd->sd.dev, "no route found for pad %u\n", pad);
+ return false;
+ }
+
+ struct media_pad *remote_pad =
+ media_pad_remote_pad_unique(&asd->sd.entity.pads[this_route->sink_pad]);
+ struct v4l2_subdev *remote_sd =
+ media_entity_to_v4l2_subdev(remote_pad->entity);
+ ret = v4l2_subdev_call(remote_sd, pad, get_frame_desc,
+ remote_pad->index, &desc);
+ if (ret)
+ return ret;
+
+ for (unsigned int i = 0; i < desc.num_entries; i++) {
+ if (desc.entry[i].stream == this_route->sink_stream) {
+ this_entry = &desc.entry[i];
+ break;
+ }
+ }
+ if (!this_entry) {
+ dev_dbg(asd->sd.dev,
+ "no frame descriptor entry found for stream %u\n",
+ this_route->sink_stream);
+ return false;
+ }
+
+ for_each_active_route(&state->routing, route) {
+ struct v4l2_mbus_frame_desc_entry *entry = NULL;
+
+ for (unsigned int i = 0; i < desc.num_entries; i++) {
+ if (desc.entry[i].stream == this_entry->stream) {
+ entry = &desc.entry[i];
+ break;
+ }
+ }
+
+ if (entry->bus.csi2.vc != this_entry->bus.csi2.vc)
+ continue;
+
+ struct media_pad *video_pad =
+ media_pad_remote_pad_unique(&asd->sd.entity.pads[route->source_pad]);
+ struct ipu6_isys_video *av = !video_pad ? NULL :
+ container_of_const(video_pad,
+ struct ipu6_isys_video, pad);
+
+ if (!av) {
+ dev_dbg(asd->sd.dev,
+ "can't find source pad for \"%s\":%u\n",
+ asd->sd.entity.name, route->source_pad);
+ return false;
+ }
+
+ streams_enabled++;
+ if (av->streaming || (enable && pad == route->source_pad))
+ nodes_streaming++;
+ }
+
+ *vc = this_entry->bus.csi2.vc;
+
+ if (streams_enabled == nodes_streaming) {
+ dev_dbg(asd->sd.dev,
+ "changing streaming state to %s on \"%s\":%u\n",
+ str_enabled_disabled(enable), asd->sd.entity.name, pad);
+ return true;
+ }
+
+ return false;
+}
+
static int ipu6_isys_csi2_enable_streams(struct v4l2_subdev *sd,
struct v4l2_subdev_state *state,
u32 pad, u64 streams_mask)
@@ -450,6 +534,7 @@ static int ipu6_isys_csi2_enable_streams(struct v4l2_subdev *sd,
struct ipu6_isys_buffer_list bl;
u64 sink_streams;
int ret;
+ u8 vc;
ret = ipu6_isys_buffer_list_get(av->stream, &bl);
if (ret < 0) {
@@ -459,6 +544,9 @@ static int ipu6_isys_csi2_enable_streams(struct v4l2_subdev *sd,
list_add(&av->csi2_entry, &csi2->av_head);
+ if (!ipu6_isys_csi2_streaming_change(asd, state, pad, &vc, true))
+ return 0;
+
ret = ipu6_isys_start_stream_firmware(av, &bl);
if (ret) {
dev_err(sd->dev, "start stream of firmware failed\n");
@@ -472,16 +560,20 @@ static int ipu6_isys_csi2_enable_streams(struct v4l2_subdev *sd,
v4l2_subdev_state_xlate_streams(state, pad, CSI2_PAD_SINK,
&streams_mask);
- ret = IS_IPU7(isp) ? ipu7_isys_csi2_stream_enable(csi2) :
- ipu6_isys_csi2_stream_enable(csi2);
- if (ret)
- goto err_stop_stream_firmware;
+ if (!csi2->streaming_vc) {
+ ret = IS_IPU7(isp) ? ipu7_isys_csi2_stream_enable(csi2) :
+ ipu6_isys_csi2_stream_enable(csi2);
+ if (ret)
+ goto err_stop_stream_firmware;
+ }
ret = v4l2_subdev_enable_streams(remote_sd, remote_pad->index,
sink_streams);
if (ret)
goto err_stop_stream_csi2;
+ csi2->streaming_vc |= BIT(vc);
+
return 0;
err_stop_stream_csi2:
@@ -514,6 +606,12 @@ static int ipu6_isys_csi2_disable_streams(struct v4l2_subdev *sd,
struct ipu6_device *isp = asd->isys->adev->isp;
struct v4l2_subdev *remote_sd;
u64 sink_streams;
+ u8 vc;
+
+ if (!ipu6_isys_csi2_streaming_change(asd, state, pad, &vc, false))
+ goto out_del_csi2_entry;
+
+ csi2->streaming_vc &= ~BIT(vc);
sink_streams =
v4l2_subdev_state_xlate_streams(state, pad, CSI2_PAD_SINK,
@@ -533,6 +631,7 @@ static int ipu6_isys_csi2_disable_streams(struct v4l2_subdev *sd,
ipu6_isys_close_streaming_firmware(av);
+out_del_csi2_entry:
list_del(&av->csi2_entry);
return 0;
diff --git a/drivers/media/pci/intel/ipu6/ipu6-isys-csi2.h b/drivers/media/pci/intel/ipu6/ipu6-isys-csi2.h
index 7c936154691e..a98a60e443c6 100644
--- a/drivers/media/pci/intel/ipu6/ipu6-isys-csi2.h
+++ b/drivers/media/pci/intel/ipu6/ipu6-isys-csi2.h
@@ -49,6 +49,7 @@ struct ipu6_isys_csi2 {
unsigned int port;
u32 legacy_irq_mask;
unsigned int phy_mode;
+ u32 streaming_vc;
};
struct ipu6_isys_csi2_timing {
diff --git a/drivers/media/pci/intel/ipu6/ipu6-isys-queue.c b/drivers/media/pci/intel/ipu6/ipu6-isys-queue.c
index 4754e95e4007..5eb6f17bf45b 100644
--- a/drivers/media/pci/intel/ipu6/ipu6-isys-queue.c
+++ b/drivers/media/pci/intel/ipu6/ipu6-isys-queue.c
@@ -533,14 +533,10 @@ static int start_streaming(struct vb2_queue *q, unsigned int count)
ipu6_isys_configure_stream_watermark(av, source_pad->entity);
ipu6_isys_update_stream_watermark(av, true);
- if (stream->nr_streaming != stream->nr_queues)
- goto out;
-
ret = ipu6_isys_stream_start(av);
if (ret)
goto out_stream_start;
-out:
mutex_unlock(&stream->mutex);
return 0;
@@ -574,8 +570,7 @@ static void stop_streaming(struct vb2_queue *q)
ipu6_isys_update_stream_watermark(av, false);
mutex_lock(&av->isys->stream_mutex);
- if (stream->nr_streaming == stream->nr_queues)
- ipu6_isys_video_set_streaming(av, 0);
+ ipu6_isys_video_set_streaming(av, 0);
list_del(&aq->node);
mutex_unlock(&av->isys->stream_mutex);
--
2.47.3
next prev parent reply other threads:[~2026-09-17 11:39 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-09-17 11:39 [PATCH v2 00/21] IPU6 multi-stream and metadata support preparation Sakari Ailus
2026-09-17 11:39 ` [PATCH v2 01/21] media: ipu6: Fix releasing resources at failing streamon Sakari Ailus
2026-09-17 11:39 ` [PATCH v2 02/21] media: ipu6: Move streaming control to CSI-2 receiver driver Sakari Ailus
2026-09-17 11:39 ` [PATCH v2 03/21] media: ipu6: Stream number on CSI-2 receiver source pads is always 0 Sakari Ailus
2026-09-17 11:39 ` [PATCH v2 04/21] media: ipu6: Rename misnamed out_free_watermark label in video init Sakari Ailus
2026-09-17 11:39 ` [PATCH v2 05/21] media: ipu6: Always request a capture ack Sakari Ailus
2026-09-17 11:39 ` [PATCH v2 06/21] media: ipu6: Clean up link frequency calculation Sakari Ailus
2026-09-17 11:39 ` [PATCH v2 07/21] media: ipu6: Get watermark configuration directly from ipdata Sakari Ailus
2026-09-17 11:39 ` [PATCH v2 08/21] media: ipu6: Collect IPU streams into CSI-2 receiver sub-device context Sakari Ailus
2026-09-17 11:39 ` Sakari Ailus [this message]
2026-09-18 7:36 ` [PATCH v2 09/21] media: ipu6: Start streaming once all streams have started, stop when not Nicola Fiorillo
2026-09-18 20:56 ` Sakari Ailus
2026-09-17 11:39 ` [PATCH v2 10/21] media: ipu6: Add lockdep checks for CSI-2 streaming enable and disable Sakari Ailus
2026-09-17 11:39 ` [PATCH v2 11/21] media: ipu6: Remove nr_queues and nr_streaming fields in ipu6_isys_stream Sakari Ailus
2026-09-17 11:39 ` [PATCH v2 12/21] media: ipu6: Collect enabled stream IDs Sakari Ailus
2026-09-17 11:39 ` [PATCH v2 13/21] media: ipu6: Avoid accessing av->streams before streaming Sakari Ailus
2026-09-17 11:39 ` [PATCH v2 14/21] media: ipu6: Rework watermark calculation Sakari Ailus
2026-09-17 11:39 ` [PATCH v2 15/21] media: ipu6: Rework watermark setting Sakari Ailus
2026-09-17 11:39 ` [PATCH v2 16/21] media: ipu6: Bridge the gap between streams in V4L2 and IPU6 firmware Sakari Ailus
2026-09-17 11:39 ` [PATCH v2 17/21] media: ipu6: Drop {get,put}_streams_opened() Sakari Ailus
2026-09-17 11:39 ` [PATCH v2 18/21] media: ipu6: Serialise access to stream pointers by isys stream_lock Sakari Ailus
2026-09-17 11:39 ` [PATCH v2 19/21] media: ipu6: Move firmware init/cleanup to RPM callbacks Sakari Ailus
2026-09-17 11:39 ` [PATCH v2 20/21] media: ipu6: Don't track power status, rely on runtime PM Sakari Ailus
2026-09-22 9:16 ` Manik Bajpai
2026-09-17 11:39 ` [PATCH v2 21/21] media: ipu6: Support upstream sub-devices without get_frame_desc() Sakari Ailus
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=20260917113923.59004-10-sakari.ailus@linux.intel.com \
--to=sakari.ailus@linux.intel.com \
--cc=antti.laakso@linux.intel.com \
--cc=divyamani.tripathi@intel.com \
--cc=dongcheng.yan@intel.com \
--cc=khai.wen.ng@intel.com \
--cc=linux-media@vger.kernel.org \
--cc=manik.bajpai@intel.com \
--cc=mehdi.djait@linux.intel.com \
--cc=ong.hock.yu@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.