Skip to content

IPU6 multi-stream and metadata support preparation

Sakari Ailus linux-media 3 versions – In review

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v3 Latest21 patches 3 repliesIn review
  2. v221 patches 3 repliesSuperseded
  3. v121 patches 3 repliesSuperseded

Changes in v3 from the cover letter

- Fixed handling failed streamon, i.e. propagate the error in that case.

- Rework return values for ipu6_isys_csi2_streaming_change() in patch 9.

- Fix inner loop stream check in ipu6_isys_csi2_streaming_change(), in the same patch.

Patches in v3 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/21media: ipu6: Fix releasing resources at failing streamondrivers/media/pci/intel/ipu6/ipu6-isys-queue.c+9 -80 replies
2/21media: ipu6: Move streaming control to CSI-2 receiver driverdrivers/media/pci/intel/ipu6/ipu6-fw-isys.c drivers/media/pci/intel/ipu6/ipu6-isys-csi2.c drivers/media/pci/intel/ipu6/ipu6-isys-queue.c +6 more+99 -820 replies
3/21media: ipu6: Stream number on CSI-2 receiver source pads is always 0drivers/media/pci/intel/ipu6/ipu6-isys-video.c+5 -440 replies
4/21media: ipu6: Rename misnamed out_free_watermark label in video initdrivers/media/pci/intel/ipu6/ipu6-isys-video.c+2 -20 replies
5/21media: ipu6: Always request a capture ackdrivers/media/pci/intel/ipu6/ipu6-fw-isys.c drivers/media/pci/intel/ipu6/ipu6-isys-queue.c drivers/media/pci/intel/ipu6/ipu6-isys-video.h+2 -90 replies
6/21media: ipu6: Clean up link frequency calculationdrivers/media/pci/intel/ipu6/ipu6-isys-video.c+16 -210 replies
7/21media: ipu6: Get watermark configuration directly from ipdatadrivers/media/pci/intel/ipu6/ipu6-isys-video.c drivers/media/pci/intel/ipu6/ipu6-isys-video.h+4 -100 replies
8/21media: ipu6: Collect IPU streams into CSI-2 receiver sub-device contextdrivers/media/pci/intel/ipu6/ipu6-isys-csi2.c drivers/media/pci/intel/ipu6/ipu6-isys-csi2.h drivers/media/pci/intel/ipu6/ipu6-isys-video.h+8 -00 replies
9/21media: ipu6: Start streaming once all streams have started, stop when notdrivers/media/pci/intel/ipu6/ipu6-isys-csi2.c drivers/media/pci/intel/ipu6/ipu6-isys-csi2.h drivers/media/pci/intel/ipu6/ipu6-isys-queue.c+107 -104 replies
10/21media: ipu6: Add lockdep checks for CSI-2 streaming enable and disabledrivers/media/pci/intel/ipu6/ipu6-isys-csi2.c+4 -00 replies
11/21media: ipu6: Remove nr_queues and nr_streaming fields in ipu6_isys_streamdrivers/media/pci/intel/ipu6/ipu6-isys-queue.c drivers/media/pci/intel/ipu6/ipu6-isys-video.c drivers/media/pci/intel/ipu6/ipu6-isys-video.h+20 -310 replies
12/21media: ipu6: Collect enabled stream IDsdrivers/media/pci/intel/ipu6/ipu6-isys-csi2.c drivers/media/pci/intel/ipu6/ipu6-isys-csi2.h+17 -90 replies
13/21media: ipu6: Avoid accessing av->streams before streamingdrivers/media/pci/intel/ipu6/ipu6-isys-video.c+1 -10 replies
14/21media: ipu6: Rework watermark calculationdrivers/media/pci/intel/ipu6/ipu6-isys-csi2.c drivers/media/pci/intel/ipu6/ipu6-isys-csi2.h drivers/media/pci/intel/ipu6/ipu6-isys-queue.c +4 more+103 -1430 replies
15/21media: ipu6: Rework watermark settingdrivers/media/pci/intel/ipu6/ipu6-isys.c drivers/media/pci/intel/ipu6/ipu6-isys.h+26 -840 replies
16/21media: ipu6: Bridge the gap between streams in V4L2 and IPU6 firmwaredrivers/media/pci/intel/ipu6/ipu6-fw-isys.c drivers/media/pci/intel/ipu6/ipu6-isys-csi2.c drivers/media/pci/intel/ipu6/ipu6-isys-csi2.h +6 more+331 -4620 replies
17/21media: ipu6: Drop {get,put}_streams_opened()drivers/media/pci/intel/ipu6/ipu6-isys-video.c drivers/media/pci/intel/ipu6/ipu6-isys.c drivers/media/pci/intel/ipu6/ipu6-isys.h+8 -340 replies
18/21media: ipu6: Serialise access to stream pointers by isys stream_lockdrivers/media/pci/intel/ipu6/ipu6-fw-isys.c drivers/media/pci/intel/ipu6/ipu6-isys-video.c drivers/media/pci/intel/ipu6/ipu7-fw-isys.c+26 -130 replies
19/21media: ipu6: Move firmware init/cleanup to RPM callbacksdrivers/media/pci/intel/ipu6/ipu6-isys-csi2.c drivers/media/pci/intel/ipu6/ipu6-isys-queue.c drivers/media/pci/intel/ipu6/ipu6-isys-video.c +2 more+59 -930 replies
20/21media: ipu6: Don't track power status, rely on runtime PMdrivers/media/pci/intel/ipu6/ipu6-fw-isys.c drivers/media/pci/intel/ipu6/ipu6-isys.c drivers/media/pci/intel/ipu6/ipu6-isys.h +1 more+19 -430 replies
21/21media: ipu6: Support upstream sub-devices without get_frame_desc()drivers/media/pci/intel/ipu6/ipu6-isys-csi2.c+26 -40 replies

Reviews trailers per patch

1 of 21 patches has a Reviewed-by or Acked-by of their own; the series has one for all of them.

PatchAntti LaaksoNicola Fiorillo
SeriesR-b
1/21
2/21
3/21
4/21
5/21
6/21
7/21
8/21
9/21R-b R-b
10/21
11/21
12/21
13/21
14/21
15/21
16/21
17/21
18/21
19/21
20/21
21/21

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.

Read the v3 thread

Cover letter [PATCH v3 00/21] IPU6 multi-stream and metadata support preparation

Hi folks,

I split this set off of the metadata series as it seems it can be merged early. Basically, it prepares the ipu6 driver for streaming multiple streams from a single source, when the rest of the necessary patches are merged.

All the patches in the set can be found in my metadata branch. This set possibly depends on the metadata preparation series
<https://lore.kernel.org/linux-media/[email protected]/T/#t>
I posted earlier today.

since v2:

- Fixed handling failed streamon, i.e. propagate the error in that case.

- Rework return values for ipu6_isys_csi2_streaming_change() in patch 9.

- Fix inner loop stream check in ipu6_isys_csi2_streaming_change(), in the same patch.

since v1:

- Fix intra-set use of v4l2_subdev_get_frame_desc().

- Address Antti's comment on assigning dt for a pin (fw term) from struct ipu6_isys_video. Remove vc and dt fields from the same struct, too; they were redundant.

Sakari Ailus (21):
media: ipu6: Fix releasing resources at failing streamon
media: ipu6: Move streaming control to CSI-2 receiver driver
media: ipu6: Stream number on CSI-2 receiver source pads is always 0
media: ipu6: Rename misnamed out_free_watermark label in video init
media: ipu6: Always request a capture ack
media: ipu6: Clean up link frequency calculation
media: ipu6: Get watermark configuration directly from ipdata
media: ipu6: Collect IPU streams into CSI-2 receiver sub-device
context
media: ipu6: Start streaming once all streams have started, stop when
not
media: ipu6: Add lockdep checks for CSI-2 streaming enable and disable
media: ipu6: Remove nr_queues and nr_streaming fields in
ipu6_isys_stream
media: ipu6: Collect enabled stream IDs
media: ipu6: Avoid accessing av->streams before streaming
media: ipu6: Rework watermark calculation
media: ipu6: Rework watermark setting
media: ipu6: Bridge the gap between streams in V4L2 and IPU6 firmware
media: ipu6: Drop {get,put}_streams_opened()
media: ipu6: Serialise access to stream pointers by isys stream_lock
media: ipu6: Move firmware init/cleanup to RPM callbacks
media: ipu6: Don't track power status, rely on runtime PM
media: ipu6: Support upstream sub-devices without get_frame_desc()

 drivers/media/pci/intel/ipu6/ipu6-fw-isys.c   | 103 ++-
 drivers/media/pci/intel/ipu6/ipu6-isys-csi2.c | 380 +++++++++--
 drivers/media/pci/intel/ipu6/ipu6-isys-csi2.h |  13 +-
 .../media/pci/intel/ipu6/ipu6-isys-queue.c    | 130 +---
 .../media/pci/intel/ipu6/ipu6-isys-queue.h    |   2 +
 .../media/pci/intel/ipu6/ipu6-isys-subdev.c   |  22 +-
 .../media/pci/intel/ipu6/ipu6-isys-subdev.h   |   2 +
 .../media/pci/intel/ipu6/ipu6-isys-video.c    | 642 +++++-------------
 .../media/pci/intel/ipu6/ipu6-isys-video.h    |  61 +-
 drivers/media/pci/intel/ipu6/ipu6-isys.c      | 212 +++---
 drivers/media/pci/intel/ipu6/ipu6-isys.h      |  52 +-
 drivers/media/pci/intel/ipu6/ipu7-fw-isys.c   |  78 ++-
 12 files changed, 743 insertions(+), 954 deletions(-)

base-commit: aedd77ea8168f00687c1248cdf115071e869cf93

Signature · 1 line
2.47.3