Merge tag 'vfio-v4.6-rc1' of git://github.com/awilliam/linux-vfio

[karo-tx-linux.git] / drivers / media / v4l2-core / v4l2-ioctl.c

diff --git a/drivers/media/v4l2-core/v4l2-ioctl.c b/drivers/media/v4l2-core/v4l2-ioctl.c
index 8a018c6dd16a8eff5812af61368c26054a3ed3b1..170dd68d27f40176758950f4a999b811e231d914 100644 (file)
--- a/drivers/media/v4l2-core/v4l2-ioctl.c
+++ b/drivers/media/v4l2-core/v4l2-ioctl.c
@@ -27,6 +27,7 @@
 #include <media/v4l2-event.h>
 #include <media/v4l2-device.h>
 #include <media/videobuf2-v4l2.h>
+#include <media/v4l2-mc.h>
 
 #include <trace/events/v4l2.h>
 
@@ -1041,6 +1042,12 @@ static int v4l_querycap(const struct v4l2_ioctl_ops *ops,
 static int v4l_s_input(const struct v4l2_ioctl_ops *ops,
                                struct file *file, void *fh, void *arg)
 {
+       struct video_device *vfd = video_devdata(file);
+       int ret;
+
+       ret = v4l_enable_media_source(vfd);
+       if (ret)
+               return ret;
        return ops->vidioc_s_input(file, fh, *(unsigned int *)arg);
 }
 
@@ -1165,7 +1172,7 @@ static void v4l_fill_fmtdesc(struct v4l2_fmtdesc *fmt)
        case V4L2_PIX_FMT_YVYU:         descr = "YVYU 4:2:2"; break;
        case V4L2_PIX_FMT_UYVY:         descr = "UYVY 4:2:2"; break;
        case V4L2_PIX_FMT_VYUY:         descr = "VYUY 4:2:2"; break;
-       case V4L2_PIX_FMT_YUV422P:      descr = "Planar YVU 4:2:2"; break;
+       case V4L2_PIX_FMT_YUV422P:      descr = "Planar YUV 4:2:2"; break;
        case V4L2_PIX_FMT_YUV411P:      descr = "Planar YUV 4:1:1"; break;
        case V4L2_PIX_FMT_Y41P:         descr = "YUV 4:1:1 (Packed)"; break;
        case V4L2_PIX_FMT_YUV444:       descr = "16-bit A/XYUV 4-4-4-4"; break;
@@ -1191,6 +1198,10 @@ static void v4l_fill_fmtdesc(struct v4l2_fmtdesc *fmt)
        case V4L2_PIX_FMT_NV12MT_16X16: descr = "Y/CbCr 4:2:0 (16x16 MB, N-C)"; break;
        case V4L2_PIX_FMT_YUV420M:      descr = "Planar YUV 4:2:0 (N-C)"; break;
        case V4L2_PIX_FMT_YVU420M:      descr = "Planar YVU 4:2:0 (N-C)"; break;
+       case V4L2_PIX_FMT_YUV422M:      descr = "Planar YUV 4:2:2 (N-C)"; break;
+       case V4L2_PIX_FMT_YVU422M:      descr = "Planar YVU 4:2:2 (N-C)"; break;
+       case V4L2_PIX_FMT_YUV444M:      descr = "Planar YUV 4:4:4 (N-C)"; break;
+       case V4L2_PIX_FMT_YVU444M:      descr = "Planar YVU 4:4:4 (N-C)"; break;
        case V4L2_PIX_FMT_SBGGR8:       descr = "8-bit Bayer BGBG/GRGR"; break;
        case V4L2_PIX_FMT_SGBRG8:       descr = "8-bit Bayer GBGB/RGRG"; break;
        case V4L2_PIX_FMT_SGRBG8:       descr = "8-bit Bayer GRGR/BGBG"; break;
@@ -1448,6 +1459,9 @@ static int v4l_s_fmt(const struct v4l2_ioctl_ops *ops,
        bool is_tx = vfd->vfl_dir != VFL_DIR_RX;
        int ret;
 
+       ret = v4l_enable_media_source(vfd);
+       if (ret)
+               return ret;
        v4l_sanitize_format(p);
 
        switch (p->type) {
@@ -1637,7 +1651,11 @@ static int v4l_s_tuner(const struct v4l2_ioctl_ops *ops,
 {
        struct video_device *vfd = video_devdata(file);
        struct v4l2_tuner *p = arg;
+       int ret;
 
+       ret = v4l_enable_media_source(vfd);
+       if (ret)
+               return ret;
        p->type = (vfd->vfl_type == VFL_TYPE_RADIO) ?
                        V4L2_TUNER_RADIO : V4L2_TUNER_ANALOG_TV;
        return ops->vidioc_s_tuner(file, fh, p);
@@ -1691,7 +1709,11 @@ static int v4l_s_frequency(const struct v4l2_ioctl_ops *ops,
        struct video_device *vfd = video_devdata(file);
        const struct v4l2_frequency *p = arg;
        enum v4l2_tuner_type type;
+       int ret;
 
+       ret = v4l_enable_media_source(vfd);
+       if (ret)
+               return ret;
        if (vfd->vfl_type == VFL_TYPE_SDR) {
                if (p->type != V4L2_TUNER_SDR && p->type != V4L2_TUNER_RF)
                        return -EINVAL;
@@ -1746,7 +1768,11 @@ static int v4l_s_std(const struct v4l2_ioctl_ops *ops,
 {
        struct video_device *vfd = video_devdata(file);
        v4l2_std_id id = *(v4l2_std_id *)arg, norm;
+       int ret;
 
+       ret = v4l_enable_media_source(vfd);
+       if (ret)
+               return ret;
        norm = id & vfd->tvnorms;
        if (vfd->tvnorms && !norm)      /* Check if std is supported */
                return -EINVAL;
@@ -1760,7 +1786,11 @@ static int v4l_querystd(const struct v4l2_ioctl_ops *ops,
 {
        struct video_device *vfd = video_devdata(file);
        v4l2_std_id *p = arg;
+       int ret;
 
+       ret = v4l_enable_media_source(vfd);
+       if (ret)
+               return ret;
        /*
         * If no signal is detected, then the driver should return
         * V4L2_STD_UNKNOWN. Otherwise it should return tvnorms with
@@ -1779,7 +1809,11 @@ static int v4l_s_hw_freq_seek(const struct v4l2_ioctl_ops *ops,
        struct video_device *vfd = video_devdata(file);
        struct v4l2_hw_freq_seek *p = arg;
        enum v4l2_tuner_type type;
+       int ret;
 
+       ret = v4l_enable_media_source(vfd);
+       if (ret)
+               return ret;
        /* s_hw_freq_seek is not supported for SDR for now */
        if (vfd->vfl_type == VFL_TYPE_SDR)
                return -EINVAL;