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>,
Nicola Fiorillo <nicfio@gmail.com>
Subject: [PATCH v3 12/21] media: ipu6: Collect enabled stream IDs
Date: Tue, 22 Sep 2026 15:05:29 +0300 [thread overview]
Message-ID: <20260922120538.896684-13-sakari.ailus@linux.intel.com> (raw)
In-Reply-To: <20260922120538.896684-1-sakari.ailus@linux.intel.com>
Collect enable stream IDs as streaming is enabled on video nodes. These
values will be needed once streaming actually starts. This is required for
multiple streams from a single source.
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
---
drivers/media/pci/intel/ipu6/ipu6-isys-csi2.c | 25 ++++++++++++-------
drivers/media/pci/intel/ipu6/ipu6-isys-csi2.h | 1 +
2 files changed, 17 insertions(+), 9 deletions(-)
diff --git a/drivers/media/pci/intel/ipu6/ipu6-isys-csi2.c b/drivers/media/pci/intel/ipu6/ipu6-isys-csi2.c
index 9c42f353f9f1..01dd30af08ad 100644
--- a/drivers/media/pci/intel/ipu6/ipu6-isys-csi2.c
+++ b/drivers/media/pci/intel/ipu6/ipu6-isys-csi2.c
@@ -515,6 +515,10 @@ static int ipu6_isys_csi2_streaming_change(struct ipu6_isys_subdev *asd,
return 1;
}
+ dev_dbg(asd->sd.dev, "not setting streaming %s %s (%u/%u)\n",
+ str_enabled_disabled(enable), enable ? "yet" : "anymore",
+ nodes_streaming, streams_enabled);
+
return 0;
}
@@ -545,6 +549,11 @@ static int ipu6_isys_csi2_enable_streams(struct v4l2_subdev *sd,
list_add(&av->csi2_entry, &csi2->av_head);
+ sink_streams =
+ v4l2_subdev_state_xlate_streams(state, pad, CSI2_PAD_SINK,
+ &streams_mask);
+ csi2->stream_ids |= sink_streams;
+
ret = ipu6_isys_csi2_streaming_change(asd, state, pad, &vc, true);
if (ret <= 0)
return ret;
@@ -555,13 +564,6 @@ static int ipu6_isys_csi2_enable_streams(struct v4l2_subdev *sd,
goto err_return_buffers;
}
- remote_pad = media_pad_remote_pad_first(&sd->entity.pads[CSI2_PAD_SINK]);
- remote_sd = media_entity_to_v4l2_subdev(remote_pad->entity);
-
- sink_streams =
- v4l2_subdev_state_xlate_streams(state, pad, CSI2_PAD_SINK,
- &streams_mask);
-
if (!csi2->streaming_vc) {
ret = IS_IPU7(isp) ? ipu7_isys_csi2_stream_enable(csi2) :
ipu6_isys_csi2_stream_enable(csi2);
@@ -569,8 +571,11 @@ static int ipu6_isys_csi2_enable_streams(struct v4l2_subdev *sd,
goto err_stop_stream_firmware;
}
+ remote_pad = media_pad_remote_pad_first(&sd->entity.pads[CSI2_PAD_SINK]);
+ remote_sd = media_entity_to_v4l2_subdev(remote_pad->entity);
+
ret = v4l2_subdev_enable_streams(remote_sd, remote_pad->index,
- sink_streams);
+ csi2->stream_ids);
if (ret)
goto err_stop_stream_csi2;
@@ -589,6 +594,7 @@ static int ipu6_isys_csi2_enable_streams(struct v4l2_subdev *sd,
ipu6_isys_close_streaming_firmware(av);
err_return_buffers:
+ csi2->stream_ids &= ~sink_streams;
list_del(&av->csi2_entry);
ipu6_isys_buffer_list_queue(&bl, IPU6_ISYS_BUFFER_LIST_FL_INCOMING, 0);
@@ -633,7 +639,8 @@ static int ipu6_isys_csi2_disable_streams(struct v4l2_subdev *sd,
else
ipu6_isys_csi2_stream_disable(csi2);
- v4l2_subdev_disable_streams(remote_sd, remote_pad->index, sink_streams);
+ v4l2_subdev_disable_streams(remote_sd, remote_pad->index,
+ csi2->stream_ids);
ipu6_isys_close_streaming_firmware(av);
diff --git a/drivers/media/pci/intel/ipu6/ipu6-isys-csi2.h b/drivers/media/pci/intel/ipu6/ipu6-isys-csi2.h
index a98a60e443c6..4d84899fde4c 100644
--- a/drivers/media/pci/intel/ipu6/ipu6-isys-csi2.h
+++ b/drivers/media/pci/intel/ipu6/ipu6-isys-csi2.h
@@ -50,6 +50,7 @@ struct ipu6_isys_csi2 {
u32 legacy_irq_mask;
unsigned int phy_mode;
u32 streaming_vc;
+ u64 stream_ids;
};
struct ipu6_isys_csi2_timing {
--
2.47.3
next prev parent reply other threads:[~2026-09-22 12:05 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-09-22 12:05 [PATCH v3 00/21] IPU6 multi-stream and metadata support preparation Sakari Ailus
2026-09-22 12:05 ` [PATCH v3 01/21] media: ipu6: Fix releasing resources at failing streamon Sakari Ailus
2026-09-22 12:05 ` [PATCH v3 02/21] media: ipu6: Move streaming control to CSI-2 receiver driver Sakari Ailus
2026-09-22 12:05 ` [PATCH v3 03/21] media: ipu6: Stream number on CSI-2 receiver source pads is always 0 Sakari Ailus
2026-09-22 12:05 ` [PATCH v3 04/21] media: ipu6: Rename misnamed out_free_watermark label in video init Sakari Ailus
2026-09-22 12:05 ` [PATCH v3 05/21] media: ipu6: Always request a capture ack Sakari Ailus
2026-09-22 12:05 ` [PATCH v3 06/21] media: ipu6: Clean up link frequency calculation Sakari Ailus
2026-09-22 12:05 ` [PATCH v3 07/21] media: ipu6: Get watermark configuration directly from ipdata Sakari Ailus
2026-09-22 12:05 ` [PATCH v3 08/21] media: ipu6: Collect IPU streams into CSI-2 receiver sub-device context Sakari Ailus
2026-09-22 12:05 ` [PATCH v3 09/21] media: ipu6: Start streaming once all streams have started, stop when not Sakari Ailus
2026-09-23 14:54 ` Nicola Fiorillo
2026-09-24 10:20 ` Sakari Ailus
2026-09-26 18:25 ` [PATCH v4 1/1] " Sakari Ailus
2026-09-27 5:03 ` Nicola Fiorillo
2026-09-22 12:05 ` [PATCH v3 10/21] media: ipu6: Add lockdep checks for CSI-2 streaming enable and disable Sakari Ailus
2026-09-22 12:05 ` [PATCH v3 11/21] media: ipu6: Remove nr_queues and nr_streaming fields in ipu6_isys_stream Sakari Ailus
2026-09-22 12:05 ` Sakari Ailus [this message]
2026-09-22 12:05 ` [PATCH v3 13/21] media: ipu6: Avoid accessing av->streams before streaming Sakari Ailus
2026-09-22 12:05 ` [PATCH v3 14/21] media: ipu6: Rework watermark calculation Sakari Ailus
2026-09-22 12:05 ` [PATCH v3 15/21] media: ipu6: Rework watermark setting Sakari Ailus
2026-09-22 12:05 ` [PATCH v3 16/21] media: ipu6: Bridge the gap between streams in V4L2 and IPU6 firmware Sakari Ailus
2026-09-22 12:05 ` [PATCH v3 17/21] media: ipu6: Drop {get,put}_streams_opened() Sakari Ailus
2026-09-22 12:05 ` [PATCH v3 18/21] media: ipu6: Serialise access to stream pointers by isys stream_lock Sakari Ailus
2026-09-22 12:05 ` [PATCH v3 19/21] media: ipu6: Move firmware init/cleanup to RPM callbacks Sakari Ailus
2026-09-22 12:05 ` [PATCH v3 20/21] media: ipu6: Don't track power status, rely on runtime PM Sakari Ailus
2026-09-22 12:05 ` [PATCH v3 21/21] media: ipu6: Support upstream sub-devices without get_frame_desc() Sakari Ailus
2026-09-23 12:04 ` [PATCH v3 00/21] IPU6 multi-stream and metadata support preparation Antti Laakso
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=20260922120538.896684-13-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=nicfio@gmail.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox