| Message ID | 20240313072516.241106-10-sakari.ailus@linux.intel.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | Generic line based metadata support, internal pads | expand |
On 3/13/24 08:24, Sakari Ailus wrote: > Document internal source pads, pads that have both SINK and INTERNAL flags > set. Use the IMX219 camera sensor as an example. > > Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com> > --- > .../userspace-api/media/v4l/dev-subdev.rst | 145 ++++++++++++++++++ > 1 file changed, 145 insertions(+) > > diff --git a/Documentation/userspace-api/media/v4l/dev-subdev.rst b/Documentation/userspace-api/media/v4l/dev-subdev.rst > index a387e8a15b8d..1808f40f63e3 100644 > --- a/Documentation/userspace-api/media/v4l/dev-subdev.rst > +++ b/Documentation/userspace-api/media/v4l/dev-subdev.rst > @@ -553,6 +553,27 @@ A stream at a specific point in the media pipeline is identified by the > sub-device and a (pad, stream) pair. For sub-devices that do not support > multiplexed streams the 'stream' field is always 0. > > +.. _v4l2-subdev-internal-source-pads: > + > +Internal source pads and routing > +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ > + > +Cases where a single sub-device source pad is traversed by multiple streams, one > +or more of which originate from within the sub-device itself, are special as > +there is no external sink pad for such routes. In those cases, the sources of > +the internally generated streams are represented by internal source pads, which > +are sink pads that have the :ref:`MEDIA_PAD_FL_INTERNAL <MEDIA-PAD-FL-INTERNAL>` > +pad flag set. > + > +Internal pads have all the properties of an external pad, including formats and > +selections. The format in this case is the source format of the stream. An > +internal pad always has a single stream only (0). > + > +Routes from an internal source pad to an external source pad are typically not > +modifiable but they can be activated and deactivated using the > +:ref:`V4L2_SUBDEV_ROUTE_FL_ACTIVE <v4l2-subdev-routing-flags>` flag, depending > +on driver capabilities. > + > Interaction between routes, streams, formats and selections > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ > > @@ -668,3 +689,127 @@ To configure this pipeline, the userspace must take the following steps: > the configurations along the stream towards the receiver, using > :ref:`VIDIOC_SUBDEV_S_FMT <VIDIOC_SUBDEV_G_FMT>` ioctls to configure each > stream endpoint in each sub-device. > + > +Internal pads setup example > +^^^^^^^^^^^^^^^^^^^^^^^^^^^ > + > +A simple example of a multiplexed stream setup might be as follows: > + > +- An IMX219 camera sensor source sub-device, with one sink pad (0), one source pad > + (1), an internal sink pad (2) that represents the source of embedded The pixel pad is an internal pad as well ? > + data. There are two routes, one from the sink pad to the source, and another > + from the internal sink pad to the source pad. Both streams are always active, > + i.e. there is no need to separately enable the embedded data stream. The > + sensor uses the CSI-2 bus. > + > +- A CSI-2 receiver in the SoC (Receiver). The receiver has a single sink pad > + (pad 0), connected to the bridge, and two source pads (pads 1-2), going to the > + DMA engine. The receiver demultiplexes the incoming streams to the source > + pads. > + > +- DMA Engines in the SoC (DMA Engine), one for each stream. Each DMA engine is > + connected to a single source pad in the receiver. > + > +The sensor, the bridge and the receiver are modeled as V4L2 sub-devices, > +exposed to userspace via /dev/v4l-subdevX device nodes. The DMA engines are > +modeled as V4L2 devices, exposed to userspace via /dev/videoX nodes. > + > +To configure this pipeline, the userspace must take the following steps: > + > +1) Set up media links between entities: connect the sensors to the bridge, > + bridge to the receiver, and the receiver to the DMA engines. This step does > + not differ from normal non-multiplexed media controller setup. > + > +2) Configure routing > + > +.. flat-table:: Camera sensor. There are no configurable routes. > + :header-rows: 1 > + > + * - Sink Pad/Stream > + - Source Pad/Stream > + - Routing Flags > + - Comments > + * - 0/0 > + - 1/0 - 1/0 - 0/0 > + - V4L2_SUBDEV_ROUTE_FL_ACTIVE > + - Pixel data stream from the sink pad > + * - 2/0 > + - 1/1 - 0/1 > + - V4L2_SUBDEV_ROUTE_FL_ACTIVE > + - Metadata stream from the internal sink pad In latest patch "[PATCH v6 05/15] media: i2c: imx219: Add embedded data support" we have: - 0 -> source pad - 1 -> pixel/image - 2 -> EDATA This is also what you did for ov2740. With that fixed: Reviewed-by Julien Massot <julien.massot@collabora.com> Julien
Hi Julien, On Fri, Mar 15, 2024 at 04:32:59PM +0100, Julien Massot wrote: > > > On 3/13/24 08:24, Sakari Ailus wrote: > > Document internal source pads, pads that have both SINK and INTERNAL flags > > set. Use the IMX219 camera sensor as an example. > > > > Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com> > > --- > > .../userspace-api/media/v4l/dev-subdev.rst | 145 ++++++++++++++++++ > > 1 file changed, 145 insertions(+) > > > > diff --git a/Documentation/userspace-api/media/v4l/dev-subdev.rst b/Documentation/userspace-api/media/v4l/dev-subdev.rst > > index a387e8a15b8d..1808f40f63e3 100644 > > --- a/Documentation/userspace-api/media/v4l/dev-subdev.rst > > +++ b/Documentation/userspace-api/media/v4l/dev-subdev.rst > > @@ -553,6 +553,27 @@ A stream at a specific point in the media pipeline is identified by the > > sub-device and a (pad, stream) pair. For sub-devices that do not support > > multiplexed streams the 'stream' field is always 0. > > +.. _v4l2-subdev-internal-source-pads: > > + > > +Internal source pads and routing > > +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ > > + > > +Cases where a single sub-device source pad is traversed by multiple streams, one > > +or more of which originate from within the sub-device itself, are special as > > +there is no external sink pad for such routes. In those cases, the sources of > > +the internally generated streams are represented by internal source pads, which > > +are sink pads that have the :ref:`MEDIA_PAD_FL_INTERNAL <MEDIA-PAD-FL-INTERNAL>` > > +pad flag set. > > + > > +Internal pads have all the properties of an external pad, including formats and > > +selections. The format in this case is the source format of the stream. An > > +internal pad always has a single stream only (0). > > + > > +Routes from an internal source pad to an external source pad are typically not > > +modifiable but they can be activated and deactivated using the > > +:ref:`V4L2_SUBDEV_ROUTE_FL_ACTIVE <v4l2-subdev-routing-flags>` flag, depending > > +on driver capabilities. > > + > > Interaction between routes, streams, formats and selections > > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ > > @@ -668,3 +689,127 @@ To configure this pipeline, the userspace must take the following steps: > > the configurations along the stream towards the receiver, using > > :ref:`VIDIOC_SUBDEV_S_FMT <VIDIOC_SUBDEV_G_FMT>` ioctls to configure each > > stream endpoint in each sub-device. > > + > > +Internal pads setup example > > +^^^^^^^^^^^^^^^^^^^^^^^^^^^ > > + > > +A simple example of a multiplexed stream setup might be as follows: > > + > > +- An IMX219 camera sensor source sub-device, with one sink pad (0), one source pad > > + (1), an internal sink pad (2) that represents the source of embedded > The pixel pad is an internal pad as well ? How about: - An IMX219 camera sensor source sub-device, with one internal sink pad (0) for image data, one source pad (1), an internal sink pad (2) that represents the source of embedded > > > + data. There are two routes, one from the sink pad to the source, and another > > + from the internal sink pad to the source pad. Both streams are always active, > > + i.e. there is no need to separately enable the embedded data stream. The > > + sensor uses the CSI-2 bus. > > + > > +- A CSI-2 receiver in the SoC (Receiver). The receiver has a single sink pad > > + (pad 0), connected to the bridge, and two source pads (pads 1-2), going to the > > + DMA engine. The receiver demultiplexes the incoming streams to the source > > + pads. > > + > > +- DMA Engines in the SoC (DMA Engine), one for each stream. Each DMA engine is > > + connected to a single source pad in the receiver. > > + > > +The sensor, the bridge and the receiver are modeled as V4L2 sub-devices, > > +exposed to userspace via /dev/v4l-subdevX device nodes. The DMA engines are > > +modeled as V4L2 devices, exposed to userspace via /dev/videoX nodes. > > + > > +To configure this pipeline, the userspace must take the following steps: > > + > > +1) Set up media links between entities: connect the sensors to the bridge, > > + bridge to the receiver, and the receiver to the DMA engines. This step does > > + not differ from normal non-multiplexed media controller setup. > > + > > +2) Configure routing > > + > > +.. flat-table:: Camera sensor. There are no configurable routes. > > + :header-rows: 1 > > + > > + * - Sink Pad/Stream > > + - Source Pad/Stream > > + - Routing Flags > > + - Comments > > + * - 0/0 > > + - 1/0 > - 1/0 > - 0/0 > > + - V4L2_SUBDEV_ROUTE_FL_ACTIVE > > + - Pixel data stream from the sink pad > > + * - 2/0 > > + - 1/1 > - 0/1 > > + - V4L2_SUBDEV_ROUTE_FL_ACTIVE > > + - Metadata stream from the internal sink pad > > In latest patch "[PATCH v6 05/15] media: i2c: imx219: Add embedded data > support" > we have: > - 0 -> source pad > - 1 -> pixel/image > - 2 -> EDATA > > This is also what you did for ov2740. Yes, these were leftovers from the CCS example. I've fixed them. > > With that fixed: > Reviewed-by Julien Massot <julien.massot@collabora.com> Thank you!
Hi Sakari, On 3/19/24 14:47, Sakari Ailus wrote: > Hi Julien, > > On Fri, Mar 15, 2024 at 04:32:59PM +0100, Julien Massot wrote: >> >> >> On 3/13/24 08:24, Sakari Ailus wrote: >>> Document internal source pads, pads that have both SINK and INTERNAL flags >>> set. Use the IMX219 camera sensor as an example. >>> >>> Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com> >>> --- >>> .../userspace-api/media/v4l/dev-subdev.rst | 145 ++++++++++++++++++ >>> 1 file changed, 145 insertions(+) >>> >>> diff --git a/Documentation/userspace-api/media/v4l/dev-subdev.rst b/Documentation/userspace-api/media/v4l/dev-subdev.rst >>> index a387e8a15b8d..1808f40f63e3 100644 >>> --- a/Documentation/userspace-api/media/v4l/dev-subdev.rst >>> +++ b/Documentation/userspace-api/media/v4l/dev-subdev.rst >>> @@ -553,6 +553,27 @@ A stream at a specific point in the media pipeline is identified by the >>> sub-device and a (pad, stream) pair. For sub-devices that do not support >>> multiplexed streams the 'stream' field is always 0. >>> +.. _v4l2-subdev-internal-source-pads: >>> + >>> +Internal source pads and routing >>> +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ >>> + >>> +Cases where a single sub-device source pad is traversed by multiple streams, one >>> +or more of which originate from within the sub-device itself, are special as >>> +there is no external sink pad for such routes. In those cases, the sources of >>> +the internally generated streams are represented by internal source pads, which >>> +are sink pads that have the :ref:`MEDIA_PAD_FL_INTERNAL <MEDIA-PAD-FL-INTERNAL>` >>> +pad flag set. >>> + >>> +Internal pads have all the properties of an external pad, including formats and >>> +selections. The format in this case is the source format of the stream. An >>> +internal pad always has a single stream only (0). >>> + >>> +Routes from an internal source pad to an external source pad are typically not >>> +modifiable but they can be activated and deactivated using the >>> +:ref:`V4L2_SUBDEV_ROUTE_FL_ACTIVE <v4l2-subdev-routing-flags>` flag, depending >>> +on driver capabilities. >>> + >>> Interaction between routes, streams, formats and selections >>> ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ >>> @@ -668,3 +689,127 @@ To configure this pipeline, the userspace must take the following steps: >>> the configurations along the stream towards the receiver, using >>> :ref:`VIDIOC_SUBDEV_S_FMT <VIDIOC_SUBDEV_G_FMT>` ioctls to configure each >>> stream endpoint in each sub-device. >>> + >>> +Internal pads setup example >>> +^^^^^^^^^^^^^^^^^^^^^^^^^^^ >>> + >>> +A simple example of a multiplexed stream setup might be as follows: >>> + >>> +- An IMX219 camera sensor source sub-device, with one sink pad (0), one source pad >>> + (1), an internal sink pad (2) that represents the source of embedded >> The pixel pad is an internal pad as well ? > > How about: > > - An IMX219 camera sensor source sub-device, with one internal sink pad > (0) for image data, one source pad (1), an internal sink pad (2) that > represents the source of embedded sure looks good to me! > >> >>> + data. There are two routes, one from the sink pad to the source, and another >>> + from the internal sink pad to the source pad. Both streams are always active, >>> + i.e. there is no need to separately enable the embedded data stream. The >>> + sensor uses the CSI-2 bus. >>> + >>> +- A CSI-2 receiver in the SoC (Receiver). The receiver has a single sink pad >>> + (pad 0), connected to the bridge, and two source pads (pads 1-2), going to the >>> + DMA engine. The receiver demultiplexes the incoming streams to the source >>> + pads. >>> + >>> +- DMA Engines in the SoC (DMA Engine), one for each stream. Each DMA engine is >>> + connected to a single source pad in the receiver. >>> + >>> +The sensor, the bridge and the receiver are modeled as V4L2 sub-devices, >>> +exposed to userspace via /dev/v4l-subdevX device nodes. The DMA engines are >>> +modeled as V4L2 devices, exposed to userspace via /dev/videoX nodes. >>> + >>> +To configure this pipeline, the userspace must take the following steps: >>> + >>> +1) Set up media links between entities: connect the sensors to the bridge, >>> + bridge to the receiver, and the receiver to the DMA engines. This step does >>> + not differ from normal non-multiplexed media controller setup. >>> + >>> +2) Configure routing >>> + >>> +.. flat-table:: Camera sensor. There are no configurable routes. >>> + :header-rows: 1 >>> + >>> + * - Sink Pad/Stream >>> + - Source Pad/Stream >>> + - Routing Flags >>> + - Comments >>> + * - 0/0 >>> + - 1/0 >> - 1/0 >> - 0/0 >>> + - V4L2_SUBDEV_ROUTE_FL_ACTIVE >>> + - Pixel data stream from the sink pad >>> + * - 2/0 >>> + - 1/1 >> - 0/1 >>> + - V4L2_SUBDEV_ROUTE_FL_ACTIVE >>> + - Metadata stream from the internal sink pad >> >> In latest patch "[PATCH v6 05/15] media: i2c: imx219: Add embedded data >> support" >> we have: >> - 0 -> source pad >> - 1 -> pixel/image >> - 2 -> EDATA >> >> This is also what you did for ov2740. > > Yes, these were leftovers from the CCS example. I've fixed them. > >> >> With that fixed: >> Reviewed-by Julien Massot <julien.massot@collabora.com> > > Thank you! >
On Tue, Mar 19, 2024 at 01:47:07PM +0000, Sakari Ailus wrote: > On Fri, Mar 15, 2024 at 04:32:59PM +0100, Julien Massot wrote: > > On 3/13/24 08:24, Sakari Ailus wrote: > > > Document internal source pads, pads that have both SINK and INTERNAL flags > > > set. Use the IMX219 camera sensor as an example. > > > > > > Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com> > > > --- > > > .../userspace-api/media/v4l/dev-subdev.rst | 145 ++++++++++++++++++ > > > 1 file changed, 145 insertions(+) > > > > > > diff --git a/Documentation/userspace-api/media/v4l/dev-subdev.rst b/Documentation/userspace-api/media/v4l/dev-subdev.rst > > > index a387e8a15b8d..1808f40f63e3 100644 > > > --- a/Documentation/userspace-api/media/v4l/dev-subdev.rst > > > +++ b/Documentation/userspace-api/media/v4l/dev-subdev.rst > > > @@ -553,6 +553,27 @@ A stream at a specific point in the media pipeline is identified by the > > > sub-device and a (pad, stream) pair. For sub-devices that do not support > > > multiplexed streams the 'stream' field is always 0. > > > +.. _v4l2-subdev-internal-source-pads: > > > + > > > +Internal source pads and routing > > > +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ > > > + > > > +Cases where a single sub-device source pad is traversed by multiple streams, one > > > +or more of which originate from within the sub-device itself, are special as > > > +there is no external sink pad for such routes. In those cases, the sources of > > > +the internally generated streams are represented by internal source pads, which > > > +are sink pads that have the :ref:`MEDIA_PAD_FL_INTERNAL <MEDIA-PAD-FL-INTERNAL>` > > > +pad flag set. This seems to answer a question in a previous patch, where I wondered if you meant "internal sink pad" instead of "internal source pad". Given that this is will most likely be a source of confusion, I think you should explain this very clearly. .. note:: Internal source pads model the source of data *within* a sub-device, and are therefore conceptually located on the "sink" side of the sub-device from the point of view of sub-device internal routes. For this reason, and despite their name, they use the :ref:`MEDIA_PAD_FL_SINK <MEDIA-PAD-FL-SINK>` flag. When used in the routing API, they are addressed through the ``sink_pad`` and ``sink_stream`` fields of the :c:type:`v4l2_subdev_route` structure. I hope this will be enough... We'll need to be extra careful during review in the beginning, making sure to always use the right terms. > > > + > > > +Internal pads have all the properties of an external pad, including formats and > > > +selections. The format in this case is the source format of the stream. An > > > +internal pad always has a single stream only (0). > > > + > > > +Routes from an internal source pad to an external source pad are typically not > > > +modifiable but they can be activated and deactivated using the > > > +:ref:`V4L2_SUBDEV_ROUTE_FL_ACTIVE <v4l2-subdev-routing-flags>` flag, depending > > > +on driver capabilities. > > > + > > > Interaction between routes, streams, formats and selections > > > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ > > > @@ -668,3 +689,127 @@ To configure this pipeline, the userspace must take the following steps: > > > the configurations along the stream towards the receiver, using > > > :ref:`VIDIOC_SUBDEV_S_FMT <VIDIOC_SUBDEV_G_FMT>` ioctls to configure each > > > stream endpoint in each sub-device. > > > + > > > +Internal pads setup example > > > +^^^^^^^^^^^^^^^^^^^^^^^^^^^ > > > + > > > +A simple example of a multiplexed stream setup might be as follows: > > > + > > > +- An IMX219 camera sensor source sub-device, with one sink pad (0), one source pad > > > + (1), an internal sink pad (2) that represents the source of embedded > > > > The pixel pad is an internal pad as well ? > > How about: > > - An IMX219 camera sensor source sub-device, with one internal sink pad > (0) for image data, one source pad (1), an internal sink pad (2) that > represents the source of embedded Sounds better, except you're now talking about internal sink pads, not internal source pads :-) We have to pick one option and stick to it. Same below. > > > + data. There are two routes, one from the sink pad to the source, and another "from the internal image source pad to the source" sounds weird, so you may need to write "from the internal image source pad to the external source pad". If we instead talked about "internal sink pads" to model the source of the streams, you could write "from the internal image sink pad to the source pad". > > > + from the internal sink pad to the source pad. Both streams are always active, > > > + i.e. there is no need to separately enable the embedded data stream. The > > > + sensor uses the CSI-2 bus. > > > + > > > +- A CSI-2 receiver in the SoC (Receiver). The receiver has a single sink pad > > > + (pad 0), connected to the bridge, and two source pads (pads 1-2), going to the I think you meant s/bridge/sensor/ > > > + DMA engine. The receiver demultiplexes the incoming streams to the source And "DMA engines" here ? > > > + pads. > > > + > > > +- DMA Engines in the SoC (DMA Engine), one for each stream. Each DMA engine is s/Engines/engine/ > > > + connected to a single source pad in the receiver. s/in the/of the/ > > > + > > > +The sensor, the bridge and the receiver are modeled as V4L2 sub-devices, What bridge ? Same below. > > > +exposed to userspace via /dev/v4l-subdevX device nodes. The DMA engines are > > > +modeled as V4L2 devices, exposed to userspace via /dev/videoX nodes. > > > + > > > +To configure this pipeline, the userspace must take the following steps: > > > + > > > +1) Set up media links between entities: connect the sensors to the bridge, > > > + bridge to the receiver, and the receiver to the DMA engines. This step does > > > + not differ from normal non-multiplexed media controller setup. > > > + > > > +2) Configure routing > > > + > > > +.. flat-table:: Camera sensor. There are no configurable routes. > > > + :header-rows: 1 > > > + > > > + * - Sink Pad/Stream > > > + - Source Pad/Stream > > > + - Routing Flags > > > + - Comments > > > + * - 0/0 > > > + - 1/0 > > > > - 1/0 > > - 0/0 > > > > > + - V4L2_SUBDEV_ROUTE_FL_ACTIVE > > > + - Pixel data stream from the sink pad > > > + * - 2/0 > > > + - 1/1 > > > > - 0/1 > > > > > + - V4L2_SUBDEV_ROUTE_FL_ACTIVE > > > + - Metadata stream from the internal sink pad > > > > In latest patch "[PATCH v6 05/15] media: i2c: imx219: Add embedded data > > support" > > we have: > > - 0 -> source pad > > - 1 -> pixel/image > > - 2 -> EDATA > > > > This is also what you did for ov2740. > > Yes, these were leftovers from the CCS example. I've fixed them. > > > With that fixed: > > Reviewed-by Julien Massot <julien.massot@collabora.com> > > Thank you!
Hi Laurent, On Wed, Mar 20, 2024 at 02:26:25AM +0200, Laurent Pinchart wrote: > On Tue, Mar 19, 2024 at 01:47:07PM +0000, Sakari Ailus wrote: > > On Fri, Mar 15, 2024 at 04:32:59PM +0100, Julien Massot wrote: > > > On 3/13/24 08:24, Sakari Ailus wrote: > > > > Document internal source pads, pads that have both SINK and INTERNAL flags > > > > set. Use the IMX219 camera sensor as an example. > > > > > > > > Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com> > > > > --- > > > > .../userspace-api/media/v4l/dev-subdev.rst | 145 ++++++++++++++++++ > > > > 1 file changed, 145 insertions(+) > > > > > > > > diff --git a/Documentation/userspace-api/media/v4l/dev-subdev.rst b/Documentation/userspace-api/media/v4l/dev-subdev.rst > > > > index a387e8a15b8d..1808f40f63e3 100644 > > > > --- a/Documentation/userspace-api/media/v4l/dev-subdev.rst > > > > +++ b/Documentation/userspace-api/media/v4l/dev-subdev.rst > > > > @@ -553,6 +553,27 @@ A stream at a specific point in the media pipeline is identified by the > > > > sub-device and a (pad, stream) pair. For sub-devices that do not support > > > > multiplexed streams the 'stream' field is always 0. > > > > +.. _v4l2-subdev-internal-source-pads: > > > > + > > > > +Internal source pads and routing > > > > +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ > > > > + > > > > +Cases where a single sub-device source pad is traversed by multiple streams, one > > > > +or more of which originate from within the sub-device itself, are special as > > > > +there is no external sink pad for such routes. In those cases, the sources of > > > > +the internally generated streams are represented by internal source pads, which > > > > +are sink pads that have the :ref:`MEDIA_PAD_FL_INTERNAL <MEDIA-PAD-FL-INTERNAL>` > > > > +pad flag set. > > This seems to answer a question in a previous patch, where I wondered if > you meant "internal sink pad" instead of "internal source pad". > > Given that this is will most likely be a source of confusion, I think > you should explain this very clearly. > > .. note:: > > Internal source pads model the source of data *within* a sub-device, and are > therefore conceptually located on the "sink" side of the sub-device from the > point of view of sub-device internal routes. For this reason, and despite > their name, they use the :ref:`MEDIA_PAD_FL_SINK <MEDIA-PAD-FL-SINK>` flag. > When used in the routing API, they are addressed through the ``sink_pad`` > and ``sink_stream`` fields of the :c:type:`v4l2_subdev_route` structure. > > I hope this will be enough... We'll need to be extra careful during > review in the beginning, making sure to always use the right terms. Let's see if we need something like this with the "internal source pad" concept removed. But let's revisit the topic in v9. > > > > > + > > > > +Internal pads have all the properties of an external pad, including formats and > > > > +selections. The format in this case is the source format of the stream. An > > > > +internal pad always has a single stream only (0). > > > > + > > > > +Routes from an internal source pad to an external source pad are typically not > > > > +modifiable but they can be activated and deactivated using the > > > > +:ref:`V4L2_SUBDEV_ROUTE_FL_ACTIVE <v4l2-subdev-routing-flags>` flag, depending > > > > +on driver capabilities. > > > > + > > > > Interaction between routes, streams, formats and selections > > > > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ > > > > @@ -668,3 +689,127 @@ To configure this pipeline, the userspace must take the following steps: > > > > the configurations along the stream towards the receiver, using > > > > :ref:`VIDIOC_SUBDEV_S_FMT <VIDIOC_SUBDEV_G_FMT>` ioctls to configure each > > > > stream endpoint in each sub-device. > > > > + > > > > +Internal pads setup example > > > > +^^^^^^^^^^^^^^^^^^^^^^^^^^^ > > > > + > > > > +A simple example of a multiplexed stream setup might be as follows: > > > > + > > > > +- An IMX219 camera sensor source sub-device, with one sink pad (0), one source pad > > > > + (1), an internal sink pad (2) that represents the source of embedded > > > > > > The pixel pad is an internal pad as well ? > > > > How about: > > > > - An IMX219 camera sensor source sub-device, with one internal sink pad > > (0) for image data, one source pad (1), an internal sink pad (2) that > > represents the source of embedded > > Sounds better, except you're now talking about internal sink pads, not > internal source pads :-) We have to pick one option and stick to it. > Same below. Let's discuss this in the context of patch 8. > > > > > + data. There are two routes, one from the sink pad to the source, and another > > "from the internal image source pad to the source" sounds weird, so you > may need to write "from the internal image source pad to the external > source pad". If we instead talked about "internal sink pads" to model > the source of the streams, you could write "from the internal image sink > pad to the source pad". I think this text was from the original CCS example. I'll update it for IMX290. > > > > > + from the internal sink pad to the source pad. Both streams are always active, > > > > + i.e. there is no need to separately enable the embedded data stream. The > > > > + sensor uses the CSI-2 bus. > > > > + > > > > +- A CSI-2 receiver in the SoC (Receiver). The receiver has a single sink pad > > > > + (pad 0), connected to the bridge, and two source pads (pads 1-2), going to the > > I think you meant s/bridge/sensor/ Thanks. In an earlier version there was a bridge, this was a leftover from that it seems. I'll check if there are other remaining references, too. > > > > > + DMA engine. The receiver demultiplexes the incoming streams to the source > > And "DMA engines" here ? Correct. > > > > > + pads. > > > > + > > > > +- DMA Engines in the SoC (DMA Engine), one for each stream. Each DMA engine is > > s/Engines/engine/ Sounds good. > > > > > + connected to a single source pad in the receiver. > > s/in the/of the/ Works for me. > > > > > + > > > > +The sensor, the bridge and the receiver are modeled as V4L2 sub-devices, > > What bridge ? Same below. > > > > > +exposed to userspace via /dev/v4l-subdevX device nodes. The DMA engines are > > > > +modeled as V4L2 devices, exposed to userspace via /dev/videoX nodes. > > > > + > > > > +To configure this pipeline, the userspace must take the following steps: > > > > + > > > > +1) Set up media links between entities: connect the sensors to the bridge, > > > > + bridge to the receiver, and the receiver to the DMA engines. This step does > > > > + not differ from normal non-multiplexed media controller setup. > > > > + > > > > +2) Configure routing > > > > + > > > > +.. flat-table:: Camera sensor. There are no configurable routes. > > > > + :header-rows: 1 > > > > + > > > > + * - Sink Pad/Stream > > > > + - Source Pad/Stream > > > > + - Routing Flags > > > > + - Comments > > > > + * - 0/0 > > > > + - 1/0 > > > > > > - 1/0 > > > - 0/0 > > > > > > > + - V4L2_SUBDEV_ROUTE_FL_ACTIVE > > > > + - Pixel data stream from the sink pad > > > > + * - 2/0 > > > > + - 1/1 > > > > > > - 0/1 > > > > > > > + - V4L2_SUBDEV_ROUTE_FL_ACTIVE > > > > + - Metadata stream from the internal sink pad > > > > > > In latest patch "[PATCH v6 05/15] media: i2c: imx219: Add embedded data > > > support" > > > we have: > > > - 0 -> source pad > > > - 1 -> pixel/image > > > - 2 -> EDATA > > > > > > This is also what you did for ov2740. > > > > Yes, these were leftovers from the CCS example. I've fixed them. > > > > > With that fixed: > > > Reviewed-by Julien Massot <julien.massot@collabora.com> > > > > Thank you! >
diff --git a/Documentation/userspace-api/media/v4l/dev-subdev.rst b/Documentation/userspace-api/media/v4l/dev-subdev.rst index a387e8a15b8d..1808f40f63e3 100644 --- a/Documentation/userspace-api/media/v4l/dev-subdev.rst +++ b/Documentation/userspace-api/media/v4l/dev-subdev.rst @@ -553,6 +553,27 @@ A stream at a specific point in the media pipeline is identified by the sub-device and a (pad, stream) pair. For sub-devices that do not support multiplexed streams the 'stream' field is always 0. +.. _v4l2-subdev-internal-source-pads: + +Internal source pads and routing +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +Cases where a single sub-device source pad is traversed by multiple streams, one +or more of which originate from within the sub-device itself, are special as +there is no external sink pad for such routes. In those cases, the sources of +the internally generated streams are represented by internal source pads, which +are sink pads that have the :ref:`MEDIA_PAD_FL_INTERNAL <MEDIA-PAD-FL-INTERNAL>` +pad flag set. + +Internal pads have all the properties of an external pad, including formats and +selections. The format in this case is the source format of the stream. An +internal pad always has a single stream only (0). + +Routes from an internal source pad to an external source pad are typically not +modifiable but they can be activated and deactivated using the +:ref:`V4L2_SUBDEV_ROUTE_FL_ACTIVE <v4l2-subdev-routing-flags>` flag, depending +on driver capabilities. + Interaction between routes, streams, formats and selections ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -668,3 +689,127 @@ To configure this pipeline, the userspace must take the following steps: the configurations along the stream towards the receiver, using :ref:`VIDIOC_SUBDEV_S_FMT <VIDIOC_SUBDEV_G_FMT>` ioctls to configure each stream endpoint in each sub-device. + +Internal pads setup example +^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +A simple example of a multiplexed stream setup might be as follows: + +- An IMX219 camera sensor source sub-device, with one sink pad (0), one source pad + (1), an internal sink pad (2) that represents the source of embedded + data. There are two routes, one from the sink pad to the source, and another + from the internal sink pad to the source pad. Both streams are always active, + i.e. there is no need to separately enable the embedded data stream. The + sensor uses the CSI-2 bus. + +- A CSI-2 receiver in the SoC (Receiver). The receiver has a single sink pad + (pad 0), connected to the bridge, and two source pads (pads 1-2), going to the + DMA engine. The receiver demultiplexes the incoming streams to the source + pads. + +- DMA Engines in the SoC (DMA Engine), one for each stream. Each DMA engine is + connected to a single source pad in the receiver. + +The sensor, the bridge and the receiver are modeled as V4L2 sub-devices, +exposed to userspace via /dev/v4l-subdevX device nodes. The DMA engines are +modeled as V4L2 devices, exposed to userspace via /dev/videoX nodes. + +To configure this pipeline, the userspace must take the following steps: + +1) Set up media links between entities: connect the sensors to the bridge, + bridge to the receiver, and the receiver to the DMA engines. This step does + not differ from normal non-multiplexed media controller setup. + +2) Configure routing + +.. flat-table:: Camera sensor. There are no configurable routes. + :header-rows: 1 + + * - Sink Pad/Stream + - Source Pad/Stream + - Routing Flags + - Comments + * - 0/0 + - 1/0 + - V4L2_SUBDEV_ROUTE_FL_ACTIVE + - Pixel data stream from the sink pad + * - 2/0 + - 1/1 + - V4L2_SUBDEV_ROUTE_FL_ACTIVE + - Metadata stream from the internal sink pad + +.. flat-table:: Receiver routing table. Typically both routes need to be + explicitly set. + :header-rows: 1 + + * - Sink Pad/Stream + - Source Pad/Stream + - Routing Flags + - Comments + * - 0/0 + - 1/0 + - V4L2_SUBDEV_ROUTE_FL_ACTIVE + - Pixel data stream from camera sensor + * - 0/1 + - 2/0 + - V4L2_SUBDEV_ROUTE_FL_ACTIVE + - Metadata stream from camera sensor + +The options available in sensor's routing configuration are dictated by hardware +capabilities: typically camera sensors always produce an image data stream while +it may be possible to enable and disable the embedded data stream. + +3) Configure formats and selections + + This example assumes that the formats are propagated from sink pad to the + source pad as-is. The tables contain fields of both struct v4l2_subdev_format + and struct v4l2_mbus_framefmt. + +.. flat-table:: Formats set on the sub-devices. Bold values are set, others are + static or propagated. The order is aligned with configured + routes. + :header-rows: 1 + :fill-cells: + + * - Sub-device + - Pad/Stream + - Width + - Height + - Code + * - :rspan:`3` Camera sensor sub-device (IMX219) + - 1/0 + - 3296 + - 2480 + - MEDIA_BUS_FMT_SRGGB10 + * - 0/0 + - **3296** + - **2480** + - **MEDIA_BUS_FMT_SRGGB10** + * - 2/0 + - 3296 + - 2 + - MEDIA_BUS_FMT_IMX219_EMBEDDED + * - 1/1 + - 3296 + - 2 + - MEDIA_BUS_FMT_META_10 + * - :rspan:`3` Receiver + - 0/0 + - **3296** + - **2480** + - **MEDIA_BUS_FMT_SRGGB10** + * - 1/0 + - 3296 + - 2480 + - MEDIA_BUS_FMT_SRGGB10 + * - 0/1 + - **3296** + - **2** + - **MEDIA_BUS_FMT_META_10** + * - 2/0 + - 3296 + - 2 + - MEDIA_BUS_FMT_META_10 + +The embedded data format does not need to be configured as the format is +dictated by the pixel data format in this case.
Document internal source pads, pads that have both SINK and INTERNAL flags set. Use the IMX219 camera sensor as an example. Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com> --- .../userspace-api/media/v4l/dev-subdev.rst | 145 ++++++++++++++++++ 1 file changed, 145 insertions(+)