From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
To: Jacopo Mondi <jacopo+renesas@jmondi.org>
Cc: tomi.valkeinen@ideasonboard.com, sakari.ailus@linux.intel.com,
niklas.soderlund@ragnatech.se, kieran.bingham@ideasonboard.com,
Mauro Carvalho Chehab <mchehab@kernel.org>,
Hans Verkuil <hverkuil-cisco@xs4all.nl>,
linux-media@vger.kernel.org, linux-renesas-soc@vger.kernel.org
Subject: Re: [PATCH v4 5/6] media: max9286: Move format to subdev state
Date: Fri, 17 Dec 2021 05:09:39 +0200 [thread overview]
Message-ID: <Ybv/c/yDOCj563XB@pendragon.ideasonboard.com> (raw)
In-Reply-To: <Ybv4mnk/x3kBX74k@pendragon.ideasonboard.com>
Hi Jacopo,
On Fri, Dec 17, 2021 at 04:40:26AM +0200, Laurent Pinchart wrote:
> On Thu, Dec 16, 2021 at 06:47:45PM +0100, Jacopo Mondi wrote:
> > Move format handling to the v4l2_subdev state and store it per
> > (pad, stream) combination.
> >
> > Now that the image format is stored in the subdev state, it can be
> > accessed through v4l2_subdev_get_fmt() instead of open-coding it.
>
> It could still be good to move this to the beginning of the series, in
> order to merge the patch with 01/38 to 06/38 from the muxed streams
> series (which will be submitted standalone in a v11).
>
> This patch looks good to me otherwise.
>
> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Not quite yet actually :-)
> > Signed-off-by: Jacopo Mondi <jacopo+renesas@jmondi.org>
> > ---
> > drivers/media/i2c/max9286.c | 86 ++++++++++++-------------------------
> > 1 file changed, 27 insertions(+), 59 deletions(-)
> >
> > diff --git a/drivers/media/i2c/max9286.c b/drivers/media/i2c/max9286.c
> > index 5d728fa23f01..aa7cb7c10fc0 100644
> > --- a/drivers/media/i2c/max9286.c
> > +++ b/drivers/media/i2c/max9286.c
> > @@ -174,8 +174,6 @@ struct max9286_priv {
> > struct v4l2_ctrl_handler ctrls;
> > struct v4l2_ctrl *pixelrate;
> >
> > - struct v4l2_mbus_framefmt fmt[MAX9286_N_SINKS];
> > -
> > /* Protects controls and fmt structures */
> > struct mutex mutex;
> >
> > @@ -828,28 +826,17 @@ static int max9286_enum_mbus_code(struct v4l2_subdev *sd,
> > return 0;
> > }
> >
> > -static struct v4l2_mbus_framefmt *
> > -max9286_get_pad_format(struct max9286_priv *priv,
> > - struct v4l2_subdev_state *sd_state,
> > - unsigned int pad, u32 which)
> > -{
> > - switch (which) {
> > - case V4L2_SUBDEV_FORMAT_TRY:
> > - return v4l2_subdev_get_try_format(&priv->sd, sd_state, pad);
> > - case V4L2_SUBDEV_FORMAT_ACTIVE:
> > - return &priv->fmt[pad];
> > - default:
> > - return NULL;
> > - }
> > -}
> > -
> > static int max9286_set_fmt(struct v4l2_subdev *sd,
> > - struct v4l2_subdev_state *sd_state,
> > + struct v4l2_subdev_state *state,
> > struct v4l2_subdev_format *format)
> > {
> > - struct max9286_priv *priv = sd_to_max9286(sd);
> > - struct v4l2_mbus_framefmt *cfg_fmt;
> > + struct v4l2_mbus_framefmt *fmt;
> > + int ret = 0;
> >
> > + /*
> > + * Refuse to set format on the multiplexed source pad.
> > + * Format is propagated from sinks streams to source streams.
> > + */
> > if (format->pad == MAX9286_SRC_PAD)
> > return -EINVAL;
We should return v4l2_subdev_get_fmt() now.
> >
> > @@ -865,44 +852,28 @@ static int max9286_set_fmt(struct v4l2_subdev *sd,
> > break;
> > }
> >
> > - cfg_fmt = max9286_get_pad_format(priv, sd_state, format->pad,
> > - format->which);
> > - if (!cfg_fmt)
> > - return -EINVAL;
> > -
> > - mutex_lock(&priv->mutex);
> > - *cfg_fmt = format->format;
> > - mutex_unlock(&priv->mutex);
> > -
> > - return 0;
> > -}
> > -
> > -static int max9286_get_fmt(struct v4l2_subdev *sd,
> > - struct v4l2_subdev_state *sd_state,
> > - struct v4l2_subdev_format *format)
> > -{
> > - struct max9286_priv *priv = sd_to_max9286(sd);
> > - struct v4l2_mbus_framefmt *cfg_fmt;
> > - unsigned int pad = format->pad;
> > -
> > - /*
> > - * Multiplexed Stream Support: Support link validation by returning the
> > - * format of the first bound link. All links must have the same format,
> > - * as we do not support mixing and matching of cameras connected to the
> > - * max9286.
> > - */
> > - if (pad == MAX9286_SRC_PAD)
> > - pad = __ffs(priv->bound_sources);
> > + v4l2_subdev_lock_state(state);
> > + fmt = v4l2_state_get_stream_format(state, format->pad,
> > + format->stream);
> > + if (!fmt) {
> > + ret = -EINVAL;
> > + goto out;
> > + }
> > + *fmt = format->format;
> >
> > - cfg_fmt = max9286_get_pad_format(priv, sd_state, pad, format->which);
> > - if (!cfg_fmt)
> > - return -EINVAL;
> > + /* Propagate format to the other end of the route. */
> > + fmt = v4l2_subdev_state_get_opposite_stream_format(state, format->pad,
> > + format->stream);
> > + if (!fmt) {
> > + ret = -EINVAL;
> > + goto out;
> > + }
> > + *fmt = format->format;
> >
> > - mutex_lock(&priv->mutex);
> > - format->format = *cfg_fmt;
> > - mutex_unlock(&priv->mutex);
> > +out:
> > + v4l2_subdev_unlock_state(state);
> >
> > - return 0;
> > + return ret;
> > }
> >
> > static int max9286_routing_validate(struct max9286_priv *priv,
> > @@ -1052,7 +1023,7 @@ static const struct v4l2_subdev_video_ops max9286_video_ops = {
> > static const struct v4l2_subdev_pad_ops max9286_pad_ops = {
> > .init_cfg = max9286_init_cfg,
> > .enum_mbus_code = max9286_enum_mbus_code,
> > - .get_fmt = max9286_get_fmt,
> > + .get_fmt = v4l2_subdev_get_fmt,
> > .set_fmt = max9286_set_fmt,
> > .set_routing = max9286_set_routing,
> > };
> > @@ -1092,9 +1063,6 @@ static int max9286_v4l2_register(struct max9286_priv *priv)
> >
> > /* Configure V4L2 for the MAX9286 itself */
> >
> > - for (i = 0; i < MAX9286_N_SINKS; i++)
> > - priv->fmt[i] = max9286_default_format;
> > -
> > v4l2_i2c_subdev_init(&priv->sd, priv->client, &max9286_subdev_ops);
> > priv->sd.flags |= V4L2_SUBDEV_FL_HAS_DEVNODE |
> > V4L2_SUBDEV_FL_MULTIPLEXED;
--
Regards,
Laurent Pinchart
next prev parent reply other threads:[~2021-12-17 3:09 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-16 17:47 [PATCH v4 0/6] media: max9286: Add multiplexed streams support Jacopo Mondi
2021-12-16 17:47 ` [PATCH v4 1/6] media: max9286: Add support for v4l2_subdev_state Jacopo Mondi
2021-12-16 18:33 ` Laurent Pinchart
2021-12-16 17:47 ` [PATCH v4 2/6] media: max9286: Implement set_routing Jacopo Mondi
2021-12-17 1:56 ` Laurent Pinchart
2021-12-17 2:18 ` Laurent Pinchart
2021-12-17 2:24 ` Laurent Pinchart
2021-12-17 13:28 ` Jacopo Mondi
2021-12-16 17:47 ` [PATCH v4 3/6] media: max9286: Use enabled routes to calculate pixelrate Jacopo Mondi
2021-12-17 2:29 ` Laurent Pinchart
2021-12-17 13:32 ` Jacopo Mondi
2021-12-16 17:47 ` [PATCH v4 4/6] media: max9286: Use routes to configure link order Jacopo Mondi
2021-12-17 2:35 ` Laurent Pinchart
2021-12-17 13:38 ` Jacopo Mondi
2021-12-16 17:47 ` [PATCH v4 5/6] media: max9286: Move format to subdev state Jacopo Mondi
2021-12-17 2:40 ` Laurent Pinchart
2021-12-17 3:09 ` Laurent Pinchart [this message]
2021-12-17 14:11 ` Jacopo Mondi
2024-05-09 13:11 ` Laurent Pinchart
2021-12-16 17:47 ` [PATCH v4 6/6] media: max9286: Implement get_frame_desc() Jacopo Mondi
2021-12-17 2:45 ` Laurent Pinchart
2021-12-17 14:12 ` Jacopo Mondi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=Ybv/c/yDOCj563XB@pendragon.ideasonboard.com \
--to=laurent.pinchart@ideasonboard.com \
--cc=hverkuil-cisco@xs4all.nl \
--cc=jacopo+renesas@jmondi.org \
--cc=kieran.bingham@ideasonboard.com \
--cc=linux-media@vger.kernel.org \
--cc=linux-renesas-soc@vger.kernel.org \
--cc=mchehab@kernel.org \
--cc=niklas.soderlund@ragnatech.se \
--cc=sakari.ailus@linux.intel.com \
--cc=tomi.valkeinen@ideasonboard.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).