| Message ID | 20211017182449.64192-3-jacopo+renesas@jmondi.org (mailing list archive) |
|---|---|
| State | New |
| Delegated to: | Kieran Bingham |
| Headers | show |
| Series | media: Add multiplexed support to R-Car CSI-2 and GMSL | expand |
Hi Jacopo, Thank you for the patch. On Sun, Oct 17, 2021 at 08:24:38PM +0200, Jacopo Mondi wrote: > Add the set_routing() subdev operation to allow userspace to configure > routing on the max9286 deserializer. > > Implement route verification but do not take routing into consideration > when configuring the CSI-2 output and pixel rate yet. > > Signed-off-by: Jacopo Mondi <jacopo+renesas@jmondi.org> > --- > drivers/media/i2c/max9286.c | 88 ++++++++++++++++++++++++++++++++++++- > 1 file changed, 86 insertions(+), 2 deletions(-) > > diff --git a/drivers/media/i2c/max9286.c b/drivers/media/i2c/max9286.c > index 5997fe40509f..54b4067168df 100644 > --- a/drivers/media/i2c/max9286.c > +++ b/drivers/media/i2c/max9286.c > @@ -833,6 +833,90 @@ static int max9286_get_fmt(struct v4l2_subdev *sd, > return 0; > } > > +static int max9286_routing_verify(struct max9286_priv *priv, > + struct v4l2_subdev_krouting *routing) > +{ > + unsigned int i; > + int ret; > + > + ret = v4l2_routing_simple_verify(routing); > + if (ret) > + return ret; > + > + /* > + * Make sure all routes points to the single source pad which can have > + * up to 4 streams. All routes shall start from a sink pad and shall not > + * have more than one sink stream. The GMSL link for the sink has to be > + * enabled. > + */ > + for (i = 0; i < routing->num_routes; ++i) { > + const struct v4l2_subdev_route *route = &routing->routes[i]; > + struct max9286_source *source = &priv->sources[i]; > + > + if (route->source_pad != MAX9286_SRC_PAD || > + route->source_stream > 4) { > + dev_err(&priv->client->dev, > + "Invalid (%u,%u) source in route %u\n", > + route->source_pad, route->source_stream, i); > + return -EINVAL; > + } > + > + if (route->sink_pad >= MAX9286_N_SINKS || > + route->sink_stream != 0) { > + dev_err(&priv->client->dev, > + "Invalid (%u,%u) sink in route %u\n", > + route->sink_pad, route->sink_stream, i); > + return -EINVAL; > + } > + > + source = &priv->sources[route->sink_pad]; > + if (!source->fwnode) { > + dev_err(&priv->client->dev, > + "Cannot set route for non-active source %u\n", > + route->sink_pad); > + return -EINVAL; > + } > + } I have a patch on top of muxed streams v10 that will simplify this, I'll post it shortly and CC you. > + > + return 0; > +} > + > +static int _max9286_set_routing(struct v4l2_subdev *sd, > + struct v4l2_subdev_state *state, > + struct v4l2_subdev_krouting *routing) > +{ > + struct max9286_priv *priv = sd_to_max9286(sd); > + int ret; > + > + ret = max9286_routing_verify(priv, routing); > + if (ret) > + return ret; > + > + /* Re-initialize the format on a routing change. */ > + ret = v4l2_subdev_set_routing_with_fmt(sd, state, routing, > + &max9286_default_format); > + if (ret) > + return ret; > + > + return 0; > +} > + > +static int max9286_set_routing(struct v4l2_subdev *sd, > + struct v4l2_subdev_state *state, > + enum v4l2_subdev_format_whence which, > + struct v4l2_subdev_krouting *routing) > +{ > + struct max9286_priv *priv = sd_to_max9286(sd); > + unsigned int i; > + int ret; > + > + state = v4l2_subdev_validate_and_lock_state(sd, state); > + ret = _max9286_set_routing(sd, state, routing); > + v4l2_subdev_unlock_state(state); > + > + return ret; > +} > + > static int max9286_init_cfg(struct v4l2_subdev *sd, > struct v4l2_subdev_state *state) > { > @@ -859,8 +943,7 @@ static int max9286_init_cfg(struct v4l2_subdev *sd, > routing.routes = routes; > > state = v4l2_subdev_validate_and_lock_state(sd, state); > - ret = v4l2_subdev_set_routing_with_fmt(sd, state, &routing, > - &max9286_default_format); > + ret = _max9286_set_routing(sd, state, &routing); > v4l2_subdev_unlock_state(state); > > return ret; > @@ -875,6 +958,7 @@ static const struct v4l2_subdev_pad_ops max9286_pad_ops = { > .enum_mbus_code = max9286_enum_mbus_code, > .get_fmt = max9286_get_fmt, > .set_fmt = max9286_set_fmt, > + .set_routing = max9286_set_routing, > }; > > static const struct v4l2_subdev_ops max9286_subdev_ops = {
diff --git a/drivers/media/i2c/max9286.c b/drivers/media/i2c/max9286.c index 5997fe40509f..54b4067168df 100644 --- a/drivers/media/i2c/max9286.c +++ b/drivers/media/i2c/max9286.c @@ -833,6 +833,90 @@ static int max9286_get_fmt(struct v4l2_subdev *sd, return 0; } +static int max9286_routing_verify(struct max9286_priv *priv, + struct v4l2_subdev_krouting *routing) +{ + unsigned int i; + int ret; + + ret = v4l2_routing_simple_verify(routing); + if (ret) + return ret; + + /* + * Make sure all routes points to the single source pad which can have + * up to 4 streams. All routes shall start from a sink pad and shall not + * have more than one sink stream. The GMSL link for the sink has to be + * enabled. + */ + for (i = 0; i < routing->num_routes; ++i) { + const struct v4l2_subdev_route *route = &routing->routes[i]; + struct max9286_source *source = &priv->sources[i]; + + if (route->source_pad != MAX9286_SRC_PAD || + route->source_stream > 4) { + dev_err(&priv->client->dev, + "Invalid (%u,%u) source in route %u\n", + route->source_pad, route->source_stream, i); + return -EINVAL; + } + + if (route->sink_pad >= MAX9286_N_SINKS || + route->sink_stream != 0) { + dev_err(&priv->client->dev, + "Invalid (%u,%u) sink in route %u\n", + route->sink_pad, route->sink_stream, i); + return -EINVAL; + } + + source = &priv->sources[route->sink_pad]; + if (!source->fwnode) { + dev_err(&priv->client->dev, + "Cannot set route for non-active source %u\n", + route->sink_pad); + return -EINVAL; + } + } + + return 0; +} + +static int _max9286_set_routing(struct v4l2_subdev *sd, + struct v4l2_subdev_state *state, + struct v4l2_subdev_krouting *routing) +{ + struct max9286_priv *priv = sd_to_max9286(sd); + int ret; + + ret = max9286_routing_verify(priv, routing); + if (ret) + return ret; + + /* Re-initialize the format on a routing change. */ + ret = v4l2_subdev_set_routing_with_fmt(sd, state, routing, + &max9286_default_format); + if (ret) + return ret; + + return 0; +} + +static int max9286_set_routing(struct v4l2_subdev *sd, + struct v4l2_subdev_state *state, + enum v4l2_subdev_format_whence which, + struct v4l2_subdev_krouting *routing) +{ + struct max9286_priv *priv = sd_to_max9286(sd); + unsigned int i; + int ret; + + state = v4l2_subdev_validate_and_lock_state(sd, state); + ret = _max9286_set_routing(sd, state, routing); + v4l2_subdev_unlock_state(state); + + return ret; +} + static int max9286_init_cfg(struct v4l2_subdev *sd, struct v4l2_subdev_state *state) { @@ -859,8 +943,7 @@ static int max9286_init_cfg(struct v4l2_subdev *sd, routing.routes = routes; state = v4l2_subdev_validate_and_lock_state(sd, state); - ret = v4l2_subdev_set_routing_with_fmt(sd, state, &routing, - &max9286_default_format); + ret = _max9286_set_routing(sd, state, &routing); v4l2_subdev_unlock_state(state); return ret; @@ -875,6 +958,7 @@ static const struct v4l2_subdev_pad_ops max9286_pad_ops = { .enum_mbus_code = max9286_enum_mbus_code, .get_fmt = max9286_get_fmt, .set_fmt = max9286_set_fmt, + .set_routing = max9286_set_routing, }; static const struct v4l2_subdev_ops max9286_subdev_ops = {
Add the set_routing() subdev operation to allow userspace to configure routing on the max9286 deserializer. Implement route verification but do not take routing into consideration when configuring the CSI-2 output and pixel rate yet. Signed-off-by: Jacopo Mondi <jacopo+renesas@jmondi.org> --- drivers/media/i2c/max9286.c | 88 ++++++++++++++++++++++++++++++++++++- 1 file changed, 86 insertions(+), 2 deletions(-)