From: Jacopo Mondi <jacopo+renesas@jmondi.org>
To: tomi.valkeinen@ideasonboard.com, sakari.ailus@linux.intel.com,
laurent.pinchart@ideasonboard.com, niklas.soderlund@ragnatech.se,
kieran.bingham@ideasonboard.com
Cc: Jacopo Mondi <jacopo+renesas@jmondi.org>,
Mauro Carvalho Chehab <mchehab@kernel.org>,
Hans Verkuil <hverkuil-cisco@xs4all.nl>,
linux-media@vger.kernel.org, linux-renesas-soc@vger.kernel.org
Subject: [PATCH v4 1/6] media: max9286: Add support for v4l2_subdev_state
Date: Thu, 16 Dec 2021 18:47:41 +0100 [thread overview]
Message-ID: <20211216174746.147233-2-jacopo+renesas@jmondi.org> (raw)
In-Reply-To: <20211216174746.147233-1-jacopo+renesas@jmondi.org>
Create and initialize the v4l2_subdev_state for the max9286 driver in
order to prepare to support routing operations and multiplexed streams.
Create the subdevice state with v4l2_subdev_init_finalize() and
implement the init_cfg() operation to guarantee the state is initialized
correctly with the default device format.
Remove the max9286_open() subdev internal operation as the format of the
file-handle state is now initialized by init_cfg().
Signed-off-by: Jacopo Mondi <jacopo+renesas@jmondi.org>
---
drivers/media/i2c/max9286.c | 89 +++++++++++++++++++++++--------------
1 file changed, 56 insertions(+), 33 deletions(-)
diff --git a/drivers/media/i2c/max9286.c b/drivers/media/i2c/max9286.c
index 9e204aabf465..1b9ff537d08e 100644
--- a/drivers/media/i2c/max9286.c
+++ b/drivers/media/i2c/max9286.c
@@ -214,6 +214,17 @@ static inline struct max9286_priv *sd_to_max9286(struct v4l2_subdev *sd)
return container_of(sd, struct max9286_priv, sd);
}
+static const struct v4l2_mbus_framefmt max9286_default_format = {
+ .width = 1280,
+ .height = 800,
+ .code = MEDIA_BUS_FMT_UYVY8_1X16,
+ .colorspace = V4L2_COLORSPACE_SRGB,
+ .field = V4L2_FIELD_NONE,
+ .ycbcr_enc = V4L2_YCBCR_ENC_DEFAULT,
+ .quantization = V4L2_QUANTIZATION_DEFAULT,
+ .xfer_func = V4L2_XFER_FUNC_DEFAULT,
+};
+
/* -----------------------------------------------------------------------------
* I2C IO
*/
@@ -821,11 +832,45 @@ static int max9286_get_fmt(struct v4l2_subdev *sd,
return 0;
}
+static int max9286_init_cfg(struct v4l2_subdev *sd,
+ struct v4l2_subdev_state *state)
+{
+ struct v4l2_subdev_route routes[MAX9286_NUM_GMSL];
+ struct max9286_priv *priv = sd_to_max9286(sd);
+ struct v4l2_subdev_krouting routing;
+ struct max9286_source *source;
+ unsigned int num_routes = 0;
+ int ret;
+
+ /* Create a route for each enable source. */
+ for_each_source(priv, source) {
+ struct v4l2_subdev_route *route = &routes[num_routes++];
+ unsigned int idx = to_index(priv, source);
+
+ route->sink_pad = idx;
+ route->sink_stream = 0;
+ route->source_pad = MAX9286_SRC_PAD;
+ route->source_stream = idx;
+ route->flags = V4L2_SUBDEV_ROUTE_FL_ACTIVE;
+ }
+
+ routing.num_routes = num_routes;
+ routing.routes = routes;
+
+ v4l2_subdev_lock_state(state);
+ ret = v4l2_subdev_set_routing_with_fmt(sd, state, &routing,
+ &max9286_default_format);
+ v4l2_subdev_unlock_state(state);
+
+ return ret;
+}
+
static const struct v4l2_subdev_video_ops max9286_video_ops = {
.s_stream = max9286_s_stream,
};
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,
.set_fmt = max9286_set_fmt,
@@ -836,35 +881,6 @@ static const struct v4l2_subdev_ops max9286_subdev_ops = {
.pad = &max9286_pad_ops,
};
-static void max9286_init_format(struct v4l2_mbus_framefmt *fmt)
-{
- fmt->width = 1280;
- fmt->height = 800;
- fmt->code = MEDIA_BUS_FMT_UYVY8_1X16;
- fmt->colorspace = V4L2_COLORSPACE_SRGB;
- fmt->field = V4L2_FIELD_NONE;
- fmt->ycbcr_enc = V4L2_YCBCR_ENC_DEFAULT;
- fmt->quantization = V4L2_QUANTIZATION_DEFAULT;
- fmt->xfer_func = V4L2_XFER_FUNC_DEFAULT;
-}
-
-static int max9286_open(struct v4l2_subdev *subdev, struct v4l2_subdev_fh *fh)
-{
- struct v4l2_mbus_framefmt *format;
- unsigned int i;
-
- for (i = 0; i < MAX9286_N_SINKS; i++) {
- format = v4l2_subdev_get_try_format(subdev, fh->state, i);
- max9286_init_format(format);
- }
-
- return 0;
-}
-
-static const struct v4l2_subdev_internal_ops max9286_subdev_internal_ops = {
- .open = max9286_open,
-};
-
static int max9286_s_ctrl(struct v4l2_ctrl *ctrl)
{
switch (ctrl->id) {
@@ -896,11 +912,11 @@ static int max9286_v4l2_register(struct max9286_priv *priv)
/* Configure V4L2 for the MAX9286 itself */
for (i = 0; i < MAX9286_N_SINKS; i++)
- max9286_init_format(&priv->fmt[i]);
+ priv->fmt[i] = max9286_default_format;
v4l2_i2c_subdev_init(&priv->sd, priv->client, &max9286_subdev_ops);
- priv->sd.internal_ops = &max9286_subdev_internal_ops;
- priv->sd.flags |= V4L2_SUBDEV_FL_HAS_DEVNODE;
+ priv->sd.flags |= V4L2_SUBDEV_FL_HAS_DEVNODE |
+ V4L2_SUBDEV_FL_MULTIPLEXED;
v4l2_ctrl_handler_init(&priv->ctrls, 1);
priv->pixelrate = v4l2_ctrl_new_std(&priv->ctrls,
@@ -932,14 +948,20 @@ static int max9286_v4l2_register(struct max9286_priv *priv)
}
priv->sd.fwnode = ep;
+ ret = v4l2_subdev_init_finalize(&priv->sd);
+ if (ret)
+ goto err_put_node;
+
ret = v4l2_async_register_subdev(&priv->sd);
if (ret < 0) {
dev_err(dev, "Unable to register subdevice\n");
- goto err_put_node;
+ goto err_state_cleanup;
}
return 0;
+err_state_cleanup:
+ v4l2_subdev_cleanup(&priv->sd);
err_put_node:
fwnode_handle_put(ep);
err_async:
@@ -952,6 +974,7 @@ static void max9286_v4l2_unregister(struct max9286_priv *priv)
{
fwnode_handle_put(priv->sd.fwnode);
v4l2_async_unregister_subdev(&priv->sd);
+ v4l2_subdev_cleanup(&priv->sd);
max9286_v4l2_notifier_unregister(priv);
}
--
2.33.1
next prev parent reply other threads:[~2021-12-16 17:47 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 ` Jacopo Mondi [this message]
2021-12-16 18:33 ` [PATCH v4 1/6] media: max9286: Add support for v4l2_subdev_state 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
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=20211216174746.147233-2-jacopo+renesas@jmondi.org \
--to=jacopo+renesas@jmondi.org \
--cc=hverkuil-cisco@xs4all.nl \
--cc=kieran.bingham@ideasonboard.com \
--cc=laurent.pinchart@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).