From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
To: Jacopo Mondi <jacopo.mondi@ideasonboard.com>
Cc: "Niklas Söderlund" <niklas.soderlund+renesas@ragnatech.se>,
"Sakari Ailus" <sakari.ailus@linux.intel.com>,
"Kieran Bingham" <kieran.bingham+renesas@ideasonboard.com>,
"Tomi Valkeinen" <tomi.valkeinen@ideasonboard.com>,
linux-media@vger.kernel.org, linux-renesas-soc@vger.kernel.org
Subject: Re: [PATCH 01/19] media: adv748x: Add support for active state
Date: Fri, 3 May 2024 11:24:35 +0300 [thread overview]
Message-ID: <20240503082435.GO4959@pendragon.ideasonboard.com> (raw)
In-Reply-To: <vnfopqtz2mziczzovjrdnkmlwvh5jlywtmtw7rf7ezghlmt2nv@upkno4eaeeuh>
On Fri, May 03, 2024 at 09:55:07AM +0200, Jacopo Mondi wrote:
> Hi Laurent
>
> On Thu, May 02, 2024 at 08:34:30PM GMT, Laurent Pinchart wrote:
> > Hi Jacopo,
> >
> > Thank you for the patch.
> >
> > On Tue, Apr 30, 2024 at 12:39:37PM +0200, Jacopo Mondi wrote:
> > > Initialize and use the subdev active state to store the subdevice
> > > format.
> > >
> > > This simplifies the implementation of the get_fmt and set_fmt pad
> > > operations.
> > >
> > > Signed-off-by: Jacopo Mondi <jacopo.mondi@ideasonboard.com>
> > > ---
> > > drivers/media/i2c/adv748x/adv748x-csi2.c | 69 ++++--------------------
> > > drivers/media/i2c/adv748x/adv748x.h | 1 -
> > > 2 files changed, 11 insertions(+), 59 deletions(-)
> > >
> > > diff --git a/drivers/media/i2c/adv748x/adv748x-csi2.c b/drivers/media/i2c/adv748x/adv748x-csi2.c
> > > index 5b265b722394..435b0909bbef 100644
> > > --- a/drivers/media/i2c/adv748x/adv748x-csi2.c
> > > +++ b/drivers/media/i2c/adv748x/adv748x-csi2.c
> > > @@ -139,78 +139,26 @@ static const struct v4l2_subdev_video_ops adv748x_csi2_video_ops = {
> > > * But we must support setting the pad formats for format propagation.
> > > */
> > >
> > > -static struct v4l2_mbus_framefmt *
> > > -adv748x_csi2_get_pad_format(struct v4l2_subdev *sd,
> > > - struct v4l2_subdev_state *sd_state,
> > > - unsigned int pad, u32 which)
> > > -{
> > > - struct adv748x_csi2 *tx = adv748x_sd_to_csi2(sd);
> > > -
> > > - if (which == V4L2_SUBDEV_FORMAT_TRY)
> > > - return v4l2_subdev_state_get_format(sd_state, pad);
> > > -
> > > - return &tx->format;
> > > -}
> > > -
> > > -static int adv748x_csi2_get_format(struct v4l2_subdev *sd,
> > > - struct v4l2_subdev_state *sd_state,
> > > - struct v4l2_subdev_format *sdformat)
> > > -{
> > > - struct adv748x_csi2 *tx = adv748x_sd_to_csi2(sd);
> > > - struct adv748x_state *state = tx->state;
> > > - struct v4l2_mbus_framefmt *mbusformat;
> > > -
> > > - mbusformat = adv748x_csi2_get_pad_format(sd, sd_state, sdformat->pad,
> > > - sdformat->which);
> > > - if (!mbusformat)
> > > - return -EINVAL;
> > > -
> > > - mutex_lock(&state->mutex);
> > > -
> > > - sdformat->format = *mbusformat;
> > > -
> > > - mutex_unlock(&state->mutex);
> > > -
> > > - return 0;
> > > -}
> > > -
> > > static int adv748x_csi2_set_format(struct v4l2_subdev *sd,
> > > struct v4l2_subdev_state *sd_state,
> > > struct v4l2_subdev_format *sdformat)
> > > {
> > > - struct adv748x_csi2 *tx = adv748x_sd_to_csi2(sd);
> > > - struct adv748x_state *state = tx->state;
> > > struct v4l2_mbus_framefmt *mbusformat;
> > > - int ret = 0;
> > > -
> > > - mbusformat = adv748x_csi2_get_pad_format(sd, sd_state, sdformat->pad,
> > > - sdformat->which);
> > > - if (!mbusformat)
> > > - return -EINVAL;
> > >
> > > - mutex_lock(&state->mutex);
> > > + mbusformat = v4l2_subdev_state_get_format(sd_state, sdformat->pad);
> > >
> > > + /* Format on the source pad is always copied from the sink one. */
> > > if (sdformat->pad == ADV748X_CSI2_SOURCE) {
> > > const struct v4l2_mbus_framefmt *sink_fmt;
> > >
> > > - sink_fmt = adv748x_csi2_get_pad_format(sd, sd_state,
> > > - ADV748X_CSI2_SINK,
> > > - sdformat->which);
> > > -
> > > - if (!sink_fmt) {
> > > - ret = -EINVAL;
> > > - goto unlock;
> > > - }
> > > -
> > > + sink_fmt = v4l2_subdev_state_get_format(sd_state,
> > > + ADV748X_CSI2_SINK);
> > > sdformat->format = *sink_fmt;
> >
> > That's not the right way to do it. You should propagate the format from
> > sink to source when pad == ADV748X_CSI2_SINK, and return
> > adv748x_csi2_get_format() when pad == ADV748X_CSI2_SOURCE. Otherwise
>
> I think it's done later
I didn't know when I reviewed this patch :-)
> and this patch doesn't change the currently implemented behaviour,
> doesn't it ?
I think it does.
> Anyway, I got that you would prefer to squash the first patches in a
> single one, so this will be solved
Agreed.
> > setting the format on the sink pad will not update the state of the
> > source pad, and a get format call on the source pad will return an
> > incorrect format.
> >
> > > }
> > >
> > > *mbusformat = sdformat->format;
> > >
> > > -unlock:
> > > - mutex_unlock(&state->mutex);
> > > -
> > > - return ret;
> > > + return 0;
> > > }
> > >
> > > static int adv748x_csi2_get_mbus_config(struct v4l2_subdev *sd, unsigned int pad,
> > > @@ -228,7 +176,7 @@ static int adv748x_csi2_get_mbus_config(struct v4l2_subdev *sd, unsigned int pad
> > > }
> > >
> > > static const struct v4l2_subdev_pad_ops adv748x_csi2_pad_ops = {
> > > - .get_fmt = adv748x_csi2_get_format,
> > > + .get_fmt = v4l2_subdev_get_fmt,
> > > .set_fmt = adv748x_csi2_set_format,
> > > .get_mbus_config = adv748x_csi2_get_mbus_config,
> > > };
> > > @@ -320,6 +268,11 @@ int adv748x_csi2_init(struct adv748x_state *state, struct adv748x_csi2 *tx)
> > > if (ret)
> > > goto err_cleanup_subdev;
> > >
> > > + tx->sd.state_lock = tx->ctrl_hdl.lock;
> >
> > Maybe that's addressed in subsequent patches, but do we need a
> > device-wide lock ? The code you replace above uses the
>
> device-wide as global to the CSI-2, the HDMI and the AFE subdevices ?
Yes. Multi-subdev drivers like CCS do so, because controls of one subdev
influence operations on other subdevs. I haven't checked if it's
actually required for adv748x.
> > adv748x_state.mutex lock, which covers all subdevs. I don't think this
> > patch introduces race conditions, so this could possibly be handled on
> > top.
> >
> > > + ret = v4l2_subdev_init_finalize(&tx->sd);
> > > + if (ret)
> > > + goto err_free_ctrl;
> > > +
> > > ret = v4l2_async_register_subdev(&tx->sd);
> > > if (ret)
> > > goto err_free_ctrl;
> > > diff --git a/drivers/media/i2c/adv748x/adv748x.h b/drivers/media/i2c/adv748x/adv748x.h
> > > index d2b5e722e997..9bc0121d0eff 100644
> > > --- a/drivers/media/i2c/adv748x/adv748x.h
> > > +++ b/drivers/media/i2c/adv748x/adv748x.h
> > > @@ -75,7 +75,6 @@ enum adv748x_csi2_pads {
> > >
> > > struct adv748x_csi2 {
> > > struct adv748x_state *state;
> > > - struct v4l2_mbus_framefmt format;
> > > unsigned int page;
> > > unsigned int port;
> > > unsigned int num_lanes;
--
Regards,
Laurent Pinchart
next prev parent reply other threads:[~2024-05-03 8:24 UTC|newest]
Thread overview: 56+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-30 10:39 [PATCH 00/19] media: renesas: rcar-csi2: Support multiple streams Jacopo Mondi
2024-04-30 10:39 ` [PATCH 01/19] media: adv748x: Add support for active state Jacopo Mondi
2024-05-02 17:34 ` Laurent Pinchart
2024-05-03 7:55 ` Jacopo Mondi
2024-05-03 8:24 ` Laurent Pinchart [this message]
2024-04-30 10:39 ` [PATCH 02/19] media: adv748x: Add flags to adv748x_subdev_init() Jacopo Mondi
2024-05-02 17:37 ` Laurent Pinchart
2024-04-30 10:39 ` [PATCH 03/19] media: adv748x: Use V4L2 streams Jacopo Mondi
2024-05-02 17:40 ` Laurent Pinchart
2024-05-03 7:59 ` Jacopo Mondi
2024-05-03 8:31 ` Laurent Pinchart
2024-05-03 8:46 ` Tomi Valkeinen
2024-04-30 10:39 ` [PATCH 04/19] media: adv748x: Propagate format to opposite stream Jacopo Mondi
2024-05-02 17:41 ` Laurent Pinchart
2024-04-30 10:39 ` [PATCH 05/19] media: adv748x: Implement set_routing() Jacopo Mondi
2024-05-02 17:49 ` Laurent Pinchart
2024-05-03 8:02 ` Jacopo Mondi
2024-04-30 10:39 ` [PATCH 06/19] media: adv748x: Use routes to configure VC Jacopo Mondi
2024-05-02 17:51 ` Laurent Pinchart
2024-05-02 17:52 ` Laurent Pinchart
2024-05-03 8:05 ` Jacopo Mondi
2024-04-30 10:39 ` [PATCH 07/19] media: adv748x: Implement .get_frame_desc() Jacopo Mondi
2024-05-02 17:57 ` Laurent Pinchart
2024-04-30 10:39 ` [PATCH 08/19] media: max9286: Add support for subdev active state Jacopo Mondi
2024-05-02 18:10 ` Laurent Pinchart
2024-04-30 10:39 ` [PATCH 09/19] media: max9286: Fix enum_mbus_code Jacopo Mondi
2024-05-02 18:14 ` Laurent Pinchart
2024-04-30 10:39 ` [PATCH 10/19] media: max9286: Use frame interval from subdev state Jacopo Mondi
2024-05-02 18:23 ` Laurent Pinchart
2024-04-30 10:39 ` [PATCH 11/19] media: max9286: Use V4L2 Streams Jacopo Mondi
2024-05-02 18:25 ` Laurent Pinchart
2024-04-30 10:39 ` [PATCH 12/19] media: max9286: Implement .get_frame_desc() Jacopo Mondi
2024-05-02 18:32 ` Laurent Pinchart
2024-04-30 10:39 ` [PATCH 13/19] media: max9286: Implement support for LINK_FREQ Jacopo Mondi
2024-05-02 18:36 ` Laurent Pinchart
2024-04-30 10:39 ` [PATCH 14/19] media: max9286: Implement .get_mbus_config() Jacopo Mondi
2024-05-02 18:37 ` Laurent Pinchart
2024-04-30 10:39 ` [PATCH 15/19] media: rcar-csi2: Add support for multiplexed streams Jacopo Mondi
2024-05-02 14:23 ` Niklas Söderlund
2024-05-02 18:41 ` Laurent Pinchart
2024-05-03 8:05 ` Jacopo Mondi
2024-04-30 10:39 ` [PATCH 16/19] media: rcar-csi2: Support multiplexed transmitters Jacopo Mondi
2024-05-02 14:30 ` Niklas Söderlund
2024-05-02 21:56 ` Laurent Pinchart
2024-05-03 8:07 ` Jacopo Mondi
2024-04-30 10:39 ` [PATCH 17/19] media: rcar-csi2: Store format in the subdev state Jacopo Mondi
2024-05-02 14:32 ` Niklas Söderlund
2024-05-02 22:00 ` Laurent Pinchart
2024-04-30 10:39 ` [PATCH 18/19] media: rcar-csi2: Implement set_routing Jacopo Mondi
2024-05-02 22:16 ` Laurent Pinchart
2024-04-30 10:39 ` [PATCH 19/19] media: rcar-vin: Fix YUYV8_1X16 handling for CSI-2 Jacopo Mondi
2024-05-02 14:33 ` Niklas Söderlund
2024-05-02 22:16 ` Laurent Pinchart
2024-04-30 11:17 ` [PATCH 00/19] media: renesas: rcar-csi2: Support multiple streams Niklas Söderlund
2024-04-30 11:51 ` Jacopo Mondi
2024-05-02 17:35 ` Laurent Pinchart
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=20240503082435.GO4959@pendragon.ideasonboard.com \
--to=laurent.pinchart@ideasonboard.com \
--cc=jacopo.mondi@ideasonboard.com \
--cc=kieran.bingham+renesas@ideasonboard.com \
--cc=linux-media@vger.kernel.org \
--cc=linux-renesas-soc@vger.kernel.org \
--cc=niklas.soderlund+renesas@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).