Hi, This is v9 of the multiplexed streams series. v8 can be found from: https://lore.kernel.org/all/20210830110116.488338-1-tomi.valkeinen@xxxxxxxxxxxxxxxx/ I have pushed my work branch to: git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux.git multistream/work-v9 which contains the patches in this series, along with subdev drivers using multiplexed streams. As can be guessed from the work branch, I have been testing this series with TI's FPDLink setup. I have also done a "backwards compatibility" test by dropping all multiplexed streams patches from the CAL driver (the CSI-2 RX on the TI SoC), and using the FPDLink drivers with single-stream configuration. The changes since v8: - Fixed the use of BIT() in uAPI header. - Documentation updates. - Added documentation about multiplexed streams to dev-subdev.rst (I had this for v8, but missed it from the series...). - 'which' has been dropped from the subdev state. This affects the subdev state allocation (no need to give the try/active parameter) and set_routing() subdev op (need to pass 'which'). - Dropped v4l2_subdev_validate_state(), as it's not needed. - Renamed v4l2_subdev_alloc_state() and v4l2_subdev_free_state() to v4l2_subdev_init_finalize() and v4l2_subdev_cleanup(). I'm not super happy with the names, but I think it's better to have general init & cleanup functions, which can be used for other purposes too. - Renamed v4l2_alloc_subdev_state() and v4l2_free_subdev_state() to __v4l2_subdev_state_alloc() and __v4l2_subdev_state_free() to give an indication that they're not supposed to be used from the drivers. Tomi Jacopo Mondi (2): media: entity: Add iterator helper for entity pads media: Documentation: Add GS_ROUTING documentation Laurent Pinchart (4): media: entity: Add has_route entity operation media: entity: Add media_entity_has_route() function media: entity: Use routing information during graph traversal media: subdev: Add [GS]_ROUTING subdev ioctls and operations Sakari Ailus (13): media: entity: Use pad as a starting point for graph walk media: entity: Use pads instead of entities in the media graph walk stack media: entity: Walk the graph based on pads media: mc: Start walk from a specific pad in use count calculation media: entity: Move the pipeline from entity to pads media: entity: Use pad as the starting point for a pipeline media: entity: Skip link validation for pads to which there is no route media: entity: Add an iterator helper for connected pads media: entity: Add only connected pads to the pipeline media: entity: Add debug information in graph walk route check media: Add bus type to frame descriptors media: Add CSI-2 bus configuration to frame descriptors media: Add stream to frame descriptor Tomi Valkeinen (17): media: subdev: rename subdev-state alloc & free media: subdev: add active state to struct v4l2_subdev media: subdev: pass also the active state to subdevs from ioctls media: subdev: add subdev state locking media: subdev: Add v4l2_subdev_validate_and_lock_state() media: Documentation: add documentation about subdev state media: subdev: increase V4L2_FRAME_DESC_ENTRY_MAX to 8 media: add V4L2_SUBDEV_FL_MULTIPLEXED media: subdev: add v4l2_subdev_has_route() media: subdev: add v4l2_subdev_set_routing helper() media: Documentation: add multiplexed streams documentation media: subdev: add stream based configuration media: subdev: use streams in v4l2_subdev_link_validate() media: subdev: add "opposite" stream helper funcs media: subdev: add v4l2_subdev_get_fmt() helper function media: subdev: add v4l2_subdev_set_routing_with_fmt() helper media: subdev: add v4l2_routing_simple_verify() helper Documentation/driver-api/media/mc-core.rst | 18 +- .../driver-api/media/v4l2-subdev.rst | 36 + .../userspace-api/media/v4l/dev-subdev.rst | 166 ++++ .../userspace-api/media/v4l/user-func.rst | 1 + .../v4l/vidioc-subdev-enum-frame-interval.rst | 5 +- .../v4l/vidioc-subdev-enum-frame-size.rst | 5 +- .../v4l/vidioc-subdev-enum-mbus-code.rst | 5 +- .../media/v4l/vidioc-subdev-g-crop.rst | 5 +- .../media/v4l/vidioc-subdev-g-fmt.rst | 5 +- .../v4l/vidioc-subdev-g-frame-interval.rst | 5 +- .../media/v4l/vidioc-subdev-g-routing.rst | 146 ++++ .../media/v4l/vidioc-subdev-g-selection.rst | 5 +- drivers/media/mc/mc-device.c | 13 +- drivers/media/mc/mc-entity.c | 257 +++--- drivers/media/pci/intel/ipu3/ipu3-cio2-main.c | 6 +- .../media/platform/exynos4-is/fimc-capture.c | 8 +- .../platform/exynos4-is/fimc-isp-video.c | 8 +- drivers/media/platform/exynos4-is/fimc-isp.c | 2 +- drivers/media/platform/exynos4-is/fimc-lite.c | 10 +- drivers/media/platform/exynos4-is/media-dev.c | 20 +- drivers/media/platform/omap3isp/isp.c | 2 +- drivers/media/platform/omap3isp/ispvideo.c | 25 +- drivers/media/platform/omap3isp/ispvideo.h | 2 +- .../media/platform/qcom/camss/camss-video.c | 6 +- drivers/media/platform/rcar-vin/rcar-core.c | 16 +- drivers/media/platform/rcar-vin/rcar-dma.c | 8 +- drivers/media/platform/rcar-vin/rcar-v4l2.c | 5 +- .../platform/rockchip/rkisp1/rkisp1-capture.c | 6 +- .../media/platform/s3c-camif/camif-capture.c | 6 +- drivers/media/platform/stm32/stm32-dcmi.c | 6 +- .../platform/sunxi/sun4i-csi/sun4i_dma.c | 6 +- .../platform/sunxi/sun6i-csi/sun6i_video.c | 6 +- drivers/media/platform/ti-vpe/cal-video.c | 6 +- drivers/media/platform/vsp1/vsp1_entity.c | 6 +- drivers/media/platform/vsp1/vsp1_video.c | 18 +- drivers/media/platform/xilinx/xilinx-dma.c | 20 +- drivers/media/platform/xilinx/xilinx-dma.h | 2 +- .../media/test-drivers/vimc/vimc-capture.c | 6 +- drivers/media/usb/au0828/au0828-core.c | 8 +- drivers/media/v4l2-core/v4l2-ioctl.c | 25 +- drivers/media/v4l2-core/v4l2-mc.c | 43 +- drivers/media/v4l2-core/v4l2-subdev.c | 732 +++++++++++++++++- drivers/staging/media/imx/imx-media-utils.c | 8 +- drivers/staging/media/ipu3/ipu3-v4l2.c | 6 +- drivers/staging/media/omap4iss/iss.c | 2 +- drivers/staging/media/omap4iss/iss_video.c | 40 +- drivers/staging/media/omap4iss/iss_video.h | 2 +- drivers/staging/media/tegra-video/tegra210.c | 6 +- drivers/staging/media/tegra-video/vi.c | 6 +- include/media/media-entity.h | 143 +++- include/media/v4l2-subdev.h | 374 ++++++++- include/uapi/linux/v4l2-subdev.h | 85 +- 52 files changed, 1989 insertions(+), 369 deletions(-) create mode 100644 Documentation/userspace-api/media/v4l/vidioc-subdev-g-routing.rst -- 2.25.1
