Hi Tomi,
Thank you for the patch.
On Mon, May 24, 2021 at 02:09:06PM +0300, Tomi Valkeinen wrote:
> CAL RX has a single sink and a single source pad. To support multiple
> streams, we will have multiple source pads (up to 8, one for each
> CAL context).
>
> Change the driver to allow creating more source pads and change the code
> accordingly to handle multiple source pads. We still keep
> CAL_CAMERARX_NUM_SOURCE_PADS as 1, and the behavior is unchanged.
>
> Also rename CAL_CAMERARX_PAD_SOURCE to CAL_CAMERARX_PAD_FIRST_SOURCE to
> highlight that it's the first source.
>
> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@xxxxxxxxxxxxxxxx>
> ---
> drivers/media/platform/ti-vpe/cal-camerarx.c | 13 ++++++------
> drivers/media/platform/ti-vpe/cal-video.c | 9 +++++++--
> drivers/media/platform/ti-vpe/cal.h | 21 +++++++++++++++++---
> 3 files changed, 32 insertions(+), 11 deletions(-)
>
> diff --git a/drivers/media/platform/ti-vpe/cal-camerarx.c b/drivers/media/platform/ti-vpe/cal-camerarx.c
> index 803d53753e87..e3a4c20be1e6 100644
> --- a/drivers/media/platform/ti-vpe/cal-camerarx.c
> +++ b/drivers/media/platform/ti-vpe/cal-camerarx.c
> @@ -635,7 +635,7 @@ static int cal_camerarx_sd_enum_mbus_code(struct v4l2_subdev *sd,
> mutex_lock(&phy->mutex);
>
> /* No transcoding, source and sink codes must match. */
> - if (code->pad == CAL_CAMERARX_PAD_SOURCE) {
> + if (cal_rx_pad_is_source(code->pad)) {
> struct v4l2_mbus_framefmt *fmt;
>
> if (code->index > 0) {
> @@ -676,7 +676,7 @@ static int cal_camerarx_sd_enum_frame_size(struct v4l2_subdev *sd,
> mutex_lock(&phy->mutex);
>
> /* No transcoding, source and sink formats must match. */
> - if (fse->pad == CAL_CAMERARX_PAD_SOURCE) {
> + if (cal_rx_pad_is_source(fse->pad)) {
> struct v4l2_mbus_framefmt *fmt;
>
> fmt = cal_camerarx_get_pad_format(phy, sd_state,
> @@ -740,7 +740,7 @@ static int cal_camerarx_sd_set_fmt(struct v4l2_subdev *sd,
> unsigned int bpp;
>
> /* No transcoding, source and sink formats must match. */
> - if (format->pad == CAL_CAMERARX_PAD_SOURCE)
> + if (cal_rx_pad_is_source(format->pad))
> return cal_camerarx_sd_get_fmt(sd, sd_state, format);
>
> /*
> @@ -771,8 +771,7 @@ static int cal_camerarx_sd_set_fmt(struct v4l2_subdev *sd,
> format->which);
> *fmt = format->format;
>
> - fmt = cal_camerarx_get_pad_format(phy, sd_state,
> - CAL_CAMERARX_PAD_SOURCE,
> + fmt = cal_camerarx_get_pad_format(phy, sd_state, CAL_CAMERARX_PAD_FIRST_SOURCE,
I would have kept the line wrap.
> format->which);
> *fmt = format->format;
>
> @@ -836,6 +835,7 @@ struct cal_camerarx *cal_camerarx_create(struct cal_dev *cal,
> struct cal_camerarx *phy;
> struct v4l2_subdev *sd;
> int ret;
> + unsigned int i;
Before ret ?
Reviewed-by: Laurent Pinchart <laurent.pinchart@xxxxxxxxxxxxxxxx>
>
> phy = kzalloc(sizeof(*phy), GFP_KERNEL);
> if (!phy)
> @@ -877,7 +877,8 @@ struct cal_camerarx *cal_camerarx_create(struct cal_dev *cal,
> sd->dev = cal->dev;
>
> phy->pads[CAL_CAMERARX_PAD_SINK].flags = MEDIA_PAD_FL_SINK;
> - phy->pads[CAL_CAMERARX_PAD_SOURCE].flags = MEDIA_PAD_FL_SOURCE;
> + for (i = CAL_CAMERARX_PAD_FIRST_SOURCE; i < CAL_CAMERARX_NUM_PADS; ++i)
> + phy->pads[i].flags = MEDIA_PAD_FL_SOURCE;
> sd->entity.ops = &cal_camerarx_media_ops;
> ret = media_entity_pads_init(&sd->entity, ARRAY_SIZE(phy->pads),
> phy->pads);
> diff --git a/drivers/media/platform/ti-vpe/cal-video.c b/drivers/media/platform/ti-vpe/cal-video.c
> index efa08a9ccbd5..8ecae7dc2774 100644
> --- a/drivers/media/platform/ti-vpe/cal-video.c
> +++ b/drivers/media/platform/ti-vpe/cal-video.c
> @@ -687,8 +687,13 @@ static void cal_release_buffers(struct cal_ctx *ctx,
> static int cal_video_check_format(struct cal_ctx *ctx)
> {
> const struct v4l2_mbus_framefmt *format;
> + struct media_pad *remote_pad;
>
> - format = &ctx->phy->formats[CAL_CAMERARX_PAD_SOURCE];
> + remote_pad = media_entity_remote_pad(&ctx->pad);
> + if (!remote_pad)
> + return -ENODEV;
> +
> + format = &ctx->phy->formats[remote_pad->index];
>
> if (ctx->fmtinfo->code != format->code ||
> ctx->v_fmt.fmt.pix.height != format->height ||
> @@ -941,7 +946,7 @@ int cal_ctx_v4l2_register(struct cal_ctx *ctx)
> }
>
> ret = media_create_pad_link(&ctx->phy->subdev.entity,
> - CAL_CAMERARX_PAD_SOURCE,
> + CAL_CAMERARX_PAD_FIRST_SOURCE,
> &vfd->entity, 0,
> MEDIA_LNK_FL_IMMUTABLE |
> MEDIA_LNK_FL_ENABLED);
> diff --git a/drivers/media/platform/ti-vpe/cal.h b/drivers/media/platform/ti-vpe/cal.h
> index 8608a2c6c01a..42a3f8004077 100644
> --- a/drivers/media/platform/ti-vpe/cal.h
> +++ b/drivers/media/platform/ti-vpe/cal.h
> @@ -44,7 +44,22 @@
> #define CAL_MAX_HEIGHT_LINES 16383
>
> #define CAL_CAMERARX_PAD_SINK 0
> -#define CAL_CAMERARX_PAD_SOURCE 1
> +#define CAL_CAMERARX_PAD_FIRST_SOURCE 1
> +#define CAL_CAMERARX_NUM_SOURCE_PADS 1
> +#define CAL_CAMERARX_NUM_PADS (1 + CAL_CAMERARX_NUM_SOURCE_PADS)
> +
> +static inline bool cal_rx_pad_is_sink(u32 pad)
> +{
> + /* Camera RX has 1 sink pad, and N source pads */
> + return pad == 0;
> +}
> +
> +static inline bool cal_rx_pad_is_source(u32 pad)
> +{
> + /* Camera RX has 1 sink pad, and N source pads */
> + return pad >= CAL_CAMERARX_PAD_FIRST_SOURCE &&
> + pad <= CAL_CAMERARX_NUM_SOURCE_PADS;
> +}
>
> struct device;
> struct device_node;
> @@ -161,8 +176,8 @@ struct cal_camerarx {
> struct media_pipeline pipe;
>
> struct v4l2_subdev subdev;
> - struct media_pad pads[2];
> - struct v4l2_mbus_framefmt formats[2];
> + struct media_pad pads[CAL_CAMERARX_NUM_PADS];
> + struct v4l2_mbus_framefmt formats[CAL_CAMERARX_NUM_PADS];
>
> /* mutex for camerarx ops */
> struct mutex mutex;
--
Regards,
Laurent Pinchart
