Hi,
On 06/06/2021 19:14, Laurent Pinchart wrote:
Hi Tomi,
Thank you for the patch.
On Mon, May 24, 2021 at 02:09:09PM +0300, Tomi Valkeinen wrote:
Add routing and stream_config support to CAL driver.
Add multiplexed streams support. CAL has 8 dma-engines and can capture 8
separate streams at the same time.
Add 8 video device nodes, each representing a single dma-engine, and set
the number of source pads on camerarx to 8. Each video node can be
connected to any of the source pads on either of the camerarx instances
using media links. Camerarx internal routing is used to route the
incoming CSI-2 streams to one of the 8 source pads.
CAL doesn't support transcoding, so the driver currently allows changes
only on the camerarx sink side, and then copies the sink pad config to
the source pad. This becomes slighly more complex with 8 source pads and
multiple streams on the sink pad. A helper,
cal_camerarx_get_opposite_stream_format(), is added, which uses the
routing table to get the format from the "opposite" side.
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@xxxxxxxxxxxxxxxx>
---
drivers/media/platform/ti-vpe/cal-camerarx.c | 303 ++++++++++++++++---
drivers/media/platform/ti-vpe/cal-video.c | 103 ++++++-
drivers/media/platform/ti-vpe/cal.c | 34 ++-
drivers/media/platform/ti-vpe/cal.h | 12 +-
4 files changed, 385 insertions(+), 67 deletions(-)
diff --git a/drivers/media/platform/ti-vpe/cal-camerarx.c b/drivers/media/platform/ti-vpe/cal-camerarx.c
index cb6a37f47432..d09b06780b15 100644
--- a/drivers/media/platform/ti-vpe/cal-camerarx.c
+++ b/drivers/media/platform/ti-vpe/cal-camerarx.c
@@ -49,15 +49,33 @@ static s64 cal_camerarx_get_ext_link_freq(struct cal_camerarx *phy)
{
struct v4l2_fwnode_bus_mipi_csi2 *mipi_csi2 = &phy->endpoint.bus.mipi_csi2;
u32 num_lanes = mipi_csi2->num_data_lanes;
- const struct cal_format_info *fmtinfo;
u32 bpp;
s64 freq;
- fmtinfo = cal_format_by_code(phy->formats[CAL_CAMERARX_PAD_SINK].code);
- if (!fmtinfo)
+ /*
+ * With multistream input we don't have bpp, and cannot use
+ * V4L2_CID_PIXEL_RATE. Passing 0 as bpp causes v4l2_get_link_freq()
+ * to return an error if it falls back to V4L2_CID_PIXEL_RATE.
+ */
I agree with the comment, but I think what should be explained here is
that we allow falling back to V4L2_CID_PIXEL_RATE when there's a single
stream, and require V4L2_CID_LINK_FREQ otherwise.
+
+ if (phy->stream_configs.num_configs == 0)
return -EINVAL;
- bpp = fmtinfo->bpp;
+ if (phy->stream_configs.num_configs > 2) {
Should this be >= 2 ?
If there is one stream, from a sink pad to a source pad, we have two
configs, as each pad+stream tuple has its own config.
Tomi
