Hi Sakari,
Thank you for the patch.
On Wed, Mar 13, 2024 at 09:24:50AM +0200, Sakari Ailus wrote:
> Move G_ROUTING IOCTL handling below that of S_ROUTING. G_ROUTING
> implementation will soon needed in handling S_ROUTING as well.
>
> Signed-off-by: Sakari Ailus <sakari.ailus@xxxxxxxxxxxxxxx>
Reviewed-by: Laurent Pinchart <laurent.pinchart+renesas@xxxxxxxxxxxxxxxx>
> ---
> drivers/media/v4l2-core/v4l2-subdev.c | 54 +++++++++++++--------------
> 1 file changed, 27 insertions(+), 27 deletions(-)
>
> diff --git a/drivers/media/v4l2-core/v4l2-subdev.c b/drivers/media/v4l2-core/v4l2-subdev.c
> index 6c34df19ea2f..ec8de3f872b9 100644
> --- a/drivers/media/v4l2-core/v4l2-subdev.c
> +++ b/drivers/media/v4l2-core/v4l2-subdev.c
> @@ -909,33 +909,6 @@ static long subdev_do_ioctl(struct file *file, unsigned int cmd, void *arg,
> case VIDIOC_SUBDEV_QUERYSTD:
> return v4l2_subdev_call(sd, video, querystd, arg);
>
> - case VIDIOC_SUBDEV_G_ROUTING: {
> - struct v4l2_subdev_routing *routing = arg;
> - struct v4l2_subdev_krouting *krouting;
> -
> - if (!v4l2_subdev_enable_streams_api)
> - return -ENOIOCTLCMD;
> -
> - if (!(sd->flags & V4L2_SUBDEV_FL_STREAMS))
> - return -ENOIOCTLCMD;
> -
> - memset(routing->reserved, 0, sizeof(routing->reserved));
> -
> - krouting = &state->routing;
> -
> - if (routing->num_routes < krouting->num_routes) {
> - routing->num_routes = krouting->num_routes;
> - return -ENOSPC;
> - }
> -
> - memcpy((struct v4l2_subdev_route *)(uintptr_t)routing->routes,
> - krouting->routes,
> - krouting->num_routes * sizeof(*krouting->routes));
> - routing->num_routes = krouting->num_routes;
> -
> - return 0;
> - }
> -
> case VIDIOC_SUBDEV_S_ROUTING: {
> struct v4l2_subdev_routing *routing = arg;
> struct v4l2_subdev_route *routes =
> @@ -984,6 +957,33 @@ static long subdev_do_ioctl(struct file *file, unsigned int cmd, void *arg,
> routing->which, &krouting);
> }
>
> + case VIDIOC_SUBDEV_G_ROUTING: {
> + struct v4l2_subdev_routing *routing = arg;
> + struct v4l2_subdev_krouting *krouting;
> +
> + if (!v4l2_subdev_enable_streams_api)
> + return -ENOIOCTLCMD;
> +
> + if (!(sd->flags & V4L2_SUBDEV_FL_STREAMS))
> + return -ENOIOCTLCMD;
> +
> + memset(routing->reserved, 0, sizeof(routing->reserved));
> +
> + krouting = &state->routing;
> +
> + if (routing->num_routes < krouting->num_routes) {
> + routing->num_routes = krouting->num_routes;
> + return -ENOSPC;
> + }
> +
> + memcpy((struct v4l2_subdev_route *)(uintptr_t)routing->routes,
> + krouting->routes,
> + krouting->num_routes * sizeof(*krouting->routes));
> + routing->num_routes = krouting->num_routes;
> +
> + return 0;
> + }
> +
> case VIDIOC_SUBDEV_G_CLIENT_CAP: {
> struct v4l2_subdev_client_capability *client_cap = arg;
>
--
Regards,
Laurent Pinchart
