[media] v4l2-subdev: add support for the new enum_frame_size 'which' field

Support the new 'which' field in the enum_frame_size ops. Most drivers do not
need to be changed since they always returns the same enumeration regardless
of the 'which' field.

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Acked-by: Lad, Prabhakar <prabhakar.csengg@gmail.com>
Tested-by: Lad, Prabhakar <prabhakar.csengg@gmail.com>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Acked-by: Andrzej Hajda <a.hajda@samsung.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>

6 files changed, 17 insertions, 6 deletions

diff --git a/drivers/media/platform/vsp1/vsp1_hsit.c b/drivers/media/platform/vsp1/vsp1_hsit.c
index d226b3ff5e30..8ffb817ae525 100644
--- a/drivers/media/platform/vsp1/vsp1_hsit.c
+++ b/drivers/media/platform/vsp1/vsp1_hsit.c
@@ -76,9 +76,11 @@ static int hsit_enum_frame_size(struct v4l2_subdev *subdev,
                                 struct v4l2_subdev_pad_config *cfg,
                                 struct v4l2_subdev_frame_size_enum *fse)
 {
+        struct vsp1_hsit *hsit = to_hsit(subdev);
         struct v4l2_mbus_framefmt *format;
 
-        format = v4l2_subdev_get_try_format(subdev, cfg, fse->pad);
+        format = vsp1_entity_get_pad_format(&hsit->entity, cfg, fse->pad,
+                                            fse->which);
 
         if (fse->index || fse->code != format->code)
                 return -EINVAL;
diff --git a/drivers/media/platform/vsp1/vsp1_lif.c b/drivers/media/platform/vsp1/vsp1_lif.c
index 60f1bd85d48a..39fa5ef20fbb 100644
--- a/drivers/media/platform/vsp1/vsp1_lif.c
+++ b/drivers/media/platform/vsp1/vsp1_lif.c
@@ -109,9 +109,11 @@ static int lif_enum_frame_size(struct v4l2_subdev *subdev,
                                struct v4l2_subdev_pad_config *cfg,
                                struct v4l2_subdev_frame_size_enum *fse)
 {
+        struct vsp1_lif *lif = to_lif(subdev);
         struct v4l2_mbus_framefmt *format;
 
-        format = v4l2_subdev_get_try_format(subdev, cfg, LIF_PAD_SINK);
+        format = vsp1_entity_get_pad_format(&lif->entity, cfg, LIF_PAD_SINK,
+                                            fse->which);
 
         if (fse->index || fse->code != format->code)
                 return -EINVAL;
diff --git a/drivers/media/platform/vsp1/vsp1_lut.c b/drivers/media/platform/vsp1/vsp1_lut.c
index 8aa8c111301c..656ec272a414 100644
--- a/drivers/media/platform/vsp1/vsp1_lut.c
+++ b/drivers/media/platform/vsp1/vsp1_lut.c
@@ -117,9 +117,11 @@ static int lut_enum_frame_size(struct v4l2_subdev *subdev,
                                struct v4l2_subdev_pad_config *cfg,
                                struct v4l2_subdev_frame_size_enum *fse)
 {
+        struct vsp1_lut *lut = to_lut(subdev);
         struct v4l2_mbus_framefmt *format;
 
-        format = v4l2_subdev_get_try_format(subdev, cfg, fse->pad);
+        format = vsp1_entity_get_pad_format(&lut->entity, cfg,
+                                            fse->pad, fse->which);
 
         if (fse->index || fse->code != format->code)
                 return -EINVAL;
diff --git a/drivers/media/platform/vsp1/vsp1_rwpf.c b/drivers/media/platform/vsp1/vsp1_rwpf.c
index a083d85e84b4..fa71f4695e16 100644
--- a/drivers/media/platform/vsp1/vsp1_rwpf.c
+++ b/drivers/media/platform/vsp1/vsp1_rwpf.c
@@ -48,7 +48,8 @@ int vsp1_rwpf_enum_frame_size(struct v4l2_subdev *subdev,
         struct vsp1_rwpf *rwpf = to_rwpf(subdev);
         struct v4l2_mbus_framefmt *format;
 
-        format = v4l2_subdev_get_try_format(subdev, cfg, fse->pad);
+        format = vsp1_entity_get_pad_format(&rwpf->entity, cfg, fse->pad,
+                                            fse->which);
 
         if (fse->index || fse->code != format->code)
                 return -EINVAL;
diff --git a/drivers/media/platform/vsp1/vsp1_sru.c b/drivers/media/platform/vsp1/vsp1_sru.c
index 554340d4e2b3..6310acab60e7 100644
--- a/drivers/media/platform/vsp1/vsp1_sru.c
+++ b/drivers/media/platform/vsp1/vsp1_sru.c
@@ -200,9 +200,11 @@ static int sru_enum_frame_size(struct v4l2_subdev *subdev,
                                struct v4l2_subdev_pad_config *cfg,
                                struct v4l2_subdev_frame_size_enum *fse)
 {
+        struct vsp1_sru *sru = to_sru(subdev);
         struct v4l2_mbus_framefmt *format;
 
-        format = v4l2_subdev_get_try_format(subdev, cfg, SRU_PAD_SINK);
+        format = vsp1_entity_get_pad_format(&sru->entity, cfg,
+                                            SRU_PAD_SINK, fse->which);
 
         if (fse->index || fse->code != format->code)
                 return -EINVAL;
diff --git a/drivers/media/platform/vsp1/vsp1_uds.c b/drivers/media/platform/vsp1/vsp1_uds.c
index ef4d307f80d1..ccc8243e3493 100644
--- a/drivers/media/platform/vsp1/vsp1_uds.c
+++ b/drivers/media/platform/vsp1/vsp1_uds.c
@@ -204,9 +204,11 @@ static int uds_enum_frame_size(struct v4l2_subdev *subdev,
                                struct v4l2_subdev_pad_config *cfg,
                                struct v4l2_subdev_frame_size_enum *fse)
 {
+        struct vsp1_uds *uds = to_uds(subdev);
         struct v4l2_mbus_framefmt *format;
 
-        format = v4l2_subdev_get_try_format(subdev, cfg, UDS_PAD_SINK);
+        format = vsp1_entity_get_pad_format(&uds->entity, cfg,
+                                            UDS_PAD_SINK, fse->which);
 
         if (fse->index || fse->code != format->code)
                 return -EINVAL;