[media] v4l: enable some IOCTLs for SDR receiver

Enable stream format (FMT) IOCTLs for SDR use. These are used for negotiate
used data stream format.

Reorganise some some IOCTL selection logic.

Signed-off-by: Antti Palosaari <crope@iki.fi>
Acked-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>

1 files changed, 18 insertions, 3 deletions

diff --git a/drivers/media/v4l2-core/v4l2-dev.c b/drivers/media/v4l2-core/v4l2-dev.c
index 9764ca04f8e2..98099e827614 100644
--- a/drivers/media/v4l2-core/v4l2-dev.c
+++ b/drivers/media/v4l2-core/v4l2-dev.c
@@ -553,7 +553,7 @@ static void determine_valid_ioctls(struct video_device *vdev)
         const struct v4l2_ioctl_ops *ops = vdev->ioctl_ops;
         bool is_vid = vdev->vfl_type == VFL_TYPE_GRABBER;
         bool is_vbi = vdev->vfl_type == VFL_TYPE_VBI;
-        bool is_radio = vdev->vfl_type == VFL_TYPE_RADIO;
+        bool is_sdr = vdev->vfl_type == VFL_TYPE_SDR;
         bool is_rx = vdev->vfl_dir != VFL_DIR_TX;
         bool is_tx = vdev->vfl_dir != VFL_DIR_RX;
 
@@ -662,9 +662,20 @@ static void determine_valid_ioctls(struct video_device *vdev)
                                ops->vidioc_try_fmt_sliced_vbi_out)))
                         set_bit(_IOC_NR(VIDIOC_TRY_FMT), valid_ioctls);
                 SET_VALID_IOCTL(ops, VIDIOC_G_SLICED_VBI_CAP, vidioc_g_sliced_vbi_cap);
+        } else if (is_sdr) {
+                /* SDR specific ioctls */
+                if (ops->vidioc_enum_fmt_sdr_cap)
+                        set_bit(_IOC_NR(VIDIOC_ENUM_FMT), valid_ioctls);
+                if (ops->vidioc_g_fmt_sdr_cap)
+                        set_bit(_IOC_NR(VIDIOC_G_FMT), valid_ioctls);
+                if (ops->vidioc_s_fmt_sdr_cap)
+                        set_bit(_IOC_NR(VIDIOC_S_FMT), valid_ioctls);
+                if (ops->vidioc_try_fmt_sdr_cap)
+                        set_bit(_IOC_NR(VIDIOC_TRY_FMT), valid_ioctls);
         }
-        if (!is_radio) {
-                /* ioctls valid for video or vbi */
+
+        if (is_vid || is_vbi || is_sdr) {
+                /* ioctls valid for video, vbi or sdr */
                 SET_VALID_IOCTL(ops, VIDIOC_REQBUFS, vidioc_reqbufs);
                 SET_VALID_IOCTL(ops, VIDIOC_QUERYBUF, vidioc_querybuf);
                 SET_VALID_IOCTL(ops, VIDIOC_QBUF, vidioc_qbuf);
@@ -672,6 +683,10 @@ static void determine_valid_ioctls(struct video_device *vdev)
                 SET_VALID_IOCTL(ops, VIDIOC_DQBUF, vidioc_dqbuf);
                 SET_VALID_IOCTL(ops, VIDIOC_CREATE_BUFS, vidioc_create_bufs);
                 SET_VALID_IOCTL(ops, VIDIOC_PREPARE_BUF, vidioc_prepare_buf);
+        }
+
+        if (is_vid || is_vbi) {
+                /* ioctls valid for video or vbi */
                 if (ops->vidioc_s_std)
                         set_bit(_IOC_NR(VIDIOC_ENUMSTD), valid_ioctls);
                 SET_VALID_IOCTL(ops, VIDIOC_S_STD, vidioc_s_std);