media: subdev: add streams to v4l2_subdev_get_fmt() helper function

Add streams support to v4l2_subdev_get_fmt() helper function. Subdev
drivers that do not need to do anything special in their get_fmt op can
use this helper directly for v4l2_subdev_pad_ops.get_fmt.

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>

diff --git a/drivers/media/v4l2-core/v4l2-subdev.c b/drivers/media/v4l2-core/v4l2-subdev.c
index 7bb7c0d..be9bd05 100644 (file)
--- a/drivers/media/v4l2-core/v4l2-subdev.c
+++ b/drivers/media/v4l2-core/v4l2-subdev.c
@@ -1406,10 +1406,14 @@ int v4l2_subdev_get_fmt(struct v4l2_subdev *sd, struct v4l2_subdev_state *state,
 {
        struct v4l2_mbus_framefmt *fmt;
 
-       if (format->pad >= sd->entity.num_pads)
-               return -EINVAL;
+       if (sd->flags & V4L2_SUBDEV_FL_STREAMS)
+               fmt = v4l2_subdev_state_get_stream_format(state, format->pad,
+                                                         format->stream);
+       else if (format->pad < sd->entity.num_pads && format->stream == 0)
+               fmt = v4l2_subdev_get_pad_format(sd, state, format->pad);
+       else
+               fmt = NULL;
 
-       fmt = v4l2_subdev_get_pad_format(sd, state, format->pad);
        if (!fmt)
                return -EINVAL;