This series adds multi-stream support and PM support for Cadence CSI2RX
and TI CSI2RX SHIM drivers.
PM patches are picked from:
https://lore.kernel.org/all/20250902-ti_csi_pm-v2-0-59a3be199940@ideasonboard.com/
PATCH 01 : Remove word size alignment restriction on frame width
PATCH 02-07: Support multiple DMA contexts/video nodes in TI CSI2RX
PATCH 08-09: Use get_frame_desc to propagate virtual channel
information across Cadence and TI CSI-RX subdevs
PATCH 10-11: Use new multi-stream APIs across the drivers to support
multiplexed cameras from sources like UB960 (FPDLink)
PATCH 12: Optimize stream on by submitting all queued buffers to DMA
PATCH 13: Change the drain architecture to support multi-stream and
implement completion barriers for last drain.
PATCH 14-16: Runtime PM and System PM support for CSI-RX.
Testing for this series has been done on top of media tree with 4x IMX219
camera modules connected to TI's AM62A using V3 Link fusion mini board.
Overlay and defconfig changes for the same can be found below:
https://github.com/RISHI27-dot/linux/commits/u/multistream_v6/
v4l2-compliance results:
https://gist.github.com/Rishikesh-D/ee6926fa0db8f583752fa13480e4a8d7
---
Changes in v6:
# New patches in v6:
[PATCH v6 14/16] media: cadence: csi2rx: Support runtime PM
[PATCH v6 15/16] media: ti: j721e-csi2rx: Support runtime suspend
[PATCH v6 16/16] media: ti: j721e-csi2rx: Support system suspend
using pm_notifier
# Changes in patches from v5:
[PATCH v5 01/16] media: ti: j721e-csi2rx: Remove word size alignment
on frame width
- Remove restrictions on minimum frame width in ti_csi2rx_fill_fmt()
- Add Reviewed-by from Abhilash
[PATCH v5 02/16] dt-bindings: media: ti,j721e-csi2rx-shim: Support 32 dma chans
- No change
[PATCH v5 03/16] media: ti: j721e-csi2rx: separate out device and context
- No change
[PATCH v5 04/16] media: ti: j721e-csi2rx: prepare SHIM code for multiple contexts
- No change
[PATCH v5 05/16] media: ti: j721e-csi2rx: allocate DMA channel based on context index
- No change
[PATCH v5 06/16] media: ti: j721e-csi2rx: add a subdev for the core device
- No change
[PATCH v5 07/16] media: ti: j721e-csi2rx: get number of contexts from device tree
- Solve compilation warnings
[PATCH v5 08/16] media: cadence: csi2rx: add get_frame_desc wrapper
- No change
[PATCH v5 09/16] media: ti: j721e-csi2rx: add support for processing virtual channels
- Remove unnecessary call to v4l2_unlock_state()
[PATCH v5 10/16] media: cadence: csi2rx: add multistream support
- No change
[PATCH v5 11/16] media: ti: j721e-csi2rx: add multistream support
- No change
[PATCH v5 12/16] media: ti: j721e-csi2rx: Submit all available buffers
- No change
[PATCH v5 13/16] media: ti: j721e-csi2rx: Change the drain architecture for multistream
- Squash implementation of completion barriers for last drain cycle
- Make struct completion per ctx
Link to (v5):
https://lore.kernel.org/all/20250825142522.1826188-1-r-donadkar@ti.com/
---
Changes in v5:
# New patches in v5:
[PATCH v5 01/14] media: ti: j721e-csi2rx: Remove word size alignment
[PATCH v5 14/14] media: ti: j721e-csi2rx: Wait for the last drain
# Changes in patches from v4:
[PATCH v4 01/12] dt-bindings: media: ti,j721e-csi2rx-shim: Support 32 dma chans
- No change
[PATCH v4 02/12] media: ti: j721e-csi2rx: separate out device and context
- No change
[PATCH v4 03/12] media: ti: j721e-csi2rx: prepare SHIM code for multiple contexts
- No change
[PATCH v4 04/12] media: ti: j721e-csi2rx: allocate DMA channel based on context index
- No change
[PATCH v4 05/12] media: ti: j721e-csi2rx: add a subdev for the core device
- No change
[PATCH v4 06/12] media: ti: j721e-csi2rx: get number of contexts from device tree
- No change
[PATCH v4 07/12] media: cadence: csi2rx: add get_frame_desc wrapper
- No change
[PATCH v4 08/12] media: ti: j721e-csi2rx: add support for processing virtual channels
- No change
[PATCH v4 09/12] media: cadence: csi2rx: add multistream support
- No change
[PATCH v4 10/12] media: ti: j721e-csi2rx: add multistream support
- Serialize stream stop
- Remove the break statement to avoid early return in the loop, as
reported by Sjoerd
[PATCH v4 11/12] media: ti: j721e-csi2rx: Submit all available buffers
- Delete the list node on DMA error to avoid kernel panic
[PATCH v4 12/12] media: ti: j721e-csi2rx: Change the drain architecture for multistream
- Mention about next frame after drain being bogus
Link to (v4):
https://lore.kernel.org/all/20250514112527.1983068-1-r-donadkar@ti.com/
Changes in v4:
[PATCH 01/13] dt-bindings: media: ti,j721e-csi2rx-shim: Support 32 dma chans
- No change
[PATCH 02/13] media: ti: j721e-csi2rx: separate out device and context
- Add ctx identifier in the dev_err() message
- No change
[PATCH 03/13] media: ti: j721e-csi2rx: prepare SHIM code for multiple contexts
- Reduced the name string lenght from 32 chars to 5 chars
[PATCH 04/13] media: ti: j721e-csi2rx: allocate DMA channel based on context index
- No change
[PATCH 05/13] media: ti: j721e-csi2rx: add a subdev for the core device
- Add .enum_mbus_code callback
- Replace statically allocated struct with a global static const struct
v4l2_mbus_framefmt and used that in the _init_state() function
[PATCH 06/13] media: ti: j721e-csi2rx: get number of contexts from device tree
- Fix the drain buffer being leaked
- If the shows more number of ctx than the TI_CSI2RX_MAX_CTX, return an error
instead of warning
[PATCH 07/13] media: cadence: csi2rx: add get_frame_desc wrapper
- No change
[PATCH 08/13] media: ti: j721e-csi2rx: add support for processing virtual channels
- Call ti_csi2rx_get_vc() only once on first stream start and cache the VC data in
the driver, use the corresponding VC in all subsequent stream starts.
[PATCH 09/13] media: cadence: csi2rx: Use new enable stream APIs
[PATCH 10/13] media: cadence: csi2rx: Enable multi-stream support
- Squash the above two patches into
[PATCH v4 09/12] media: cadence: csi2rx: add multistream support
- Use already obtained csi2rx->source_pad in enable_streams() and
disable_streams() call
- Update commit message with the reason for using a custom helper for s_stream
instead of v4l2_subdev_s_stream_helper()
- Use v4l2_get_link_freq() variant that takes pad of the source as its first
argument instead of the one that takes v4l2_ctrl_handler
- Call v4l2_get_link_freq() with bpp = 0 to prevent fallback to V4L2_CID_PIXEL_RATE
in multi-stream case
- Use lock guards to simplify error handling
- Call csi2rx_update_vc_select() at first stream start before enabling the controller
[PATCH 11/13] media: ti: j721e-csi2rx: add multistream support
- No change
[PATCH 12/13] media: ti: j721e-csi2rx: Submit all available buffers
- No change
[PATCH 13/13] media: ti: j721e-csi2rx: Change the drain architecture for multistream
- Fix checkpatch warning
- Change commit message to give a better description of the patch
Link to (v3):
https://lore.kernel.org/all/20250417065554.437541-1-r-donadkar@ti.com/
Changes in v3:
- Drop [PATCH v2 01/13] media: cadence: csi2rx: Support runtime PM from
v2, support for runtime PM will be added in a separate series:
https://lore.kernel.org/all/20250224-ti_csi_pm-v1-0-8f8c29ef646d@ideasonboard.com/
- Change the drain architecture to prevent FIFO overflow in multistream
usecases.
- With the new drain architecture, we don't need the the driver to wait
for userspace to start streaming on all "actively routed" video nodes
before starting streaming on the source. So, revert back to the capture
architecture where streams can be started and stopped independent
to each other.
Link to (v2):
https://lore.kernel.org/r/20240627-multistream-v2-0-6ae96c54c1c3@ti.com
Changes in v2:
- Change the multi-camera capture architecture to be similar to that of
Tomi's RPi5 FE series, where the driver will wait for userspace to
start streaming on all "actively routed" video nodes before starting
streaming on the source. This simplifies things a lot from the HW
perspective, which might run into deadlocks due to a shared FIFO
between multiple DMA channels.
- Drop a few fixes that were posted separately and are already merged
- Fix dtschema warnings reported by Rob on [02/13]
- Fix warnings for uninitialized `used_vc` variable in cdns-csi2rx.c
- Return -EBUSY if someone updates routes for j721e-csi2rx subdev while
streaming
- Only allow single-streams to be routed to the source pads (linked to
video nodes) of the j721e-csi2rx device
- Squash the patches marked "SQUASH" in the v1 RFC series
Link to RFC (v1):
https://lore.kernel.org/r/20240222-multistream-v1-0-1837ed916eeb@ti.com
Changhuang Liang (1):
media: cadence: csi2rx: Support runtime PM
Jai Luthra (9):
dt-bindings: media: ti,j721e-csi2rx-shim: Support 32 dma chans
media: ti: j721e-csi2rx: separate out device and context
media: ti: j721e-csi2rx: add a subdev for the core device
media: ti: j721e-csi2rx: add support for processing virtual channels
media: cadence: csi2rx: add multistream support
media: ti: j721e-csi2rx: add multistream support
media: ti: j721e-csi2rx: Submit all available buffers
media: ti: j721e-csi2rx: Support runtime suspend
media: ti: j721e-csi2rx: Support system suspend using pm_notifier
Pratyush Yadav (4):
media: ti: j721e-csi2rx: prepare SHIM code for multiple contexts
media: ti: j721e-csi2rx: allocate DMA channel based on context index
media: ti: j721e-csi2rx: get number of contexts from device tree
media: cadence: csi2rx: add get_frame_desc wrapper
Rishikesh Donadkar (2):
media: ti: j721e-csi2rx: Remove word size alignment on frame width
media: ti: j721e-csi2rx: Change the drain architecture for multistream
.../bindings/media/ti,j721e-csi2rx-shim.yaml | 39 +-
drivers/media/platform/cadence/Kconfig | 1 +
drivers/media/platform/cadence/cdns-csi2rx.c | 491 +++++--
drivers/media/platform/ti/Kconfig | 1 +
.../platform/ti/j721e-csi2rx/j721e-csi2rx.c | 1166 +++++++++++++----
5 files changed, 1299 insertions(+), 399 deletions(-)
--
2.34.1