media: media/pci: set device_caps in struct video_device

Instead of filling in the struct v4l2_capability device_caps
field, fill in the struct video_device device_caps field.

That way the V4L2 core knows what the capabilities of the
video device are.

But this only really works if all drivers use this, so convert
all pci drivers in this patch.

Tested with cx88-blackbird and ivtv PVR-350.

Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>

4 files changed, 21 insertions, 13 deletions

diff --git a/drivers/media/pci/ivtv/ivtv-cards.h b/drivers/media/pci/ivtv/ivtv-cards.h
index 965def0cbfaa..f3e2c5634962 100644
--- a/drivers/media/pci/ivtv/ivtv-cards.h
+++ b/drivers/media/pci/ivtv/ivtv-cards.h
@@ -156,8 +156,7 @@
 #define IVTV_CAP_ENCODER (V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_TUNER | \
                           V4L2_CAP_AUDIO | V4L2_CAP_READWRITE | V4L2_CAP_VBI_CAPTURE | \
                           V4L2_CAP_SLICED_VBI_CAPTURE)
-#define IVTV_CAP_DECODER (V4L2_CAP_VIDEO_OUTPUT | \
-                          V4L2_CAP_SLICED_VBI_OUTPUT | V4L2_CAP_VIDEO_OUTPUT_OVERLAY)
+#define IVTV_CAP_DECODER (V4L2_CAP_VIDEO_OUTPUT | V4L2_CAP_SLICED_VBI_OUTPUT)
 
 struct ivtv_card_video_input {
         u8  video_type;         /* video input type */
diff --git a/drivers/media/pci/ivtv/ivtv-ioctl.c b/drivers/media/pci/ivtv/ivtv-ioctl.c
index d1e358a2273e..5595f6a274e7 100644
--- a/drivers/media/pci/ivtv/ivtv-ioctl.c
+++ b/drivers/media/pci/ivtv/ivtv-ioctl.c
@@ -734,18 +734,11 @@ static int ivtv_querycap(struct file *file, void *fh, struct v4l2_capability *vc
 {
         struct ivtv_open_id *id = fh2id(file->private_data);
         struct ivtv *itv = id->itv;
-        struct ivtv_stream *s = &itv->streams[id->type];
 
         strscpy(vcap->driver, IVTV_DRIVER_NAME, sizeof(vcap->driver));
         strscpy(vcap->card, itv->card_name, sizeof(vcap->card));
         snprintf(vcap->bus_info, sizeof(vcap->bus_info), "PCI:%s", pci_name(itv->pdev));
         vcap->capabilities = itv->v4l2_cap | V4L2_CAP_DEVICE_CAPS;
-        vcap->device_caps = s->caps;
-        if ((s->caps & V4L2_CAP_VIDEO_OUTPUT_OVERLAY) &&
-            !itv->osd_video_pbase) {
-                vcap->capabilities &= ~V4L2_CAP_VIDEO_OUTPUT_OVERLAY;
-                vcap->device_caps &= ~V4L2_CAP_VIDEO_OUTPUT_OVERLAY;
-        }
         return 0;
 }
 
diff --git a/drivers/media/pci/ivtv/ivtv-streams.c b/drivers/media/pci/ivtv/ivtv-streams.c
index a641f20e3f86..f7de9118f609 100644
--- a/drivers/media/pci/ivtv/ivtv-streams.c
+++ b/drivers/media/pci/ivtv/ivtv-streams.c
@@ -139,8 +139,7 @@ static struct {
                 "decoder MPG",
                 VFL_TYPE_GRABBER, IVTV_V4L2_DEC_MPG_OFFSET,
                 PCI_DMA_TODEVICE, 0,
-                V4L2_CAP_VIDEO_OUTPUT | V4L2_CAP_AUDIO | V4L2_CAP_READWRITE |
-                V4L2_CAP_VIDEO_OUTPUT_OVERLAY,
+                V4L2_CAP_VIDEO_OUTPUT | V4L2_CAP_AUDIO | V4L2_CAP_READWRITE,
                 &ivtv_v4l2_dec_fops
         },
         {       /* IVTV_DEC_STREAM_TYPE_VBI */
@@ -161,8 +160,7 @@ static struct {
                 "decoder YUV",
                 VFL_TYPE_GRABBER, IVTV_V4L2_DEC_YUV_OFFSET,
                 PCI_DMA_TODEVICE, 0,
-                V4L2_CAP_VIDEO_OUTPUT | V4L2_CAP_AUDIO | V4L2_CAP_READWRITE |
-                V4L2_CAP_VIDEO_OUTPUT_OVERLAY,
+                V4L2_CAP_VIDEO_OUTPUT | V4L2_CAP_AUDIO | V4L2_CAP_READWRITE,
                 &ivtv_v4l2_dec_fops
         }
 };
@@ -301,6 +299,14 @@ static int ivtv_reg_dev(struct ivtv *itv, int type)
                 if (s_mpg->vdev.v4l2_dev)
                         num = s_mpg->vdev.num + ivtv_stream_info[type].num_offset;
         }
+        s->vdev.device_caps = s->caps;
+        if (itv->osd_video_pbase) {
+                itv->streams[IVTV_DEC_STREAM_TYPE_YUV].vdev.device_caps |=
+                        V4L2_CAP_VIDEO_OUTPUT_OVERLAY;
+                itv->streams[IVTV_DEC_STREAM_TYPE_MPG].vdev.device_caps |=
+                        V4L2_CAP_VIDEO_OUTPUT_OVERLAY;
+                itv->v4l2_cap |= V4L2_CAP_VIDEO_OUTPUT_OVERLAY;
+        }
         video_set_drvdata(&s->vdev, s);
 
         /* Register device. First try the desired minor, then any free one. */
diff --git a/drivers/media/pci/ivtv/ivtvfb.c b/drivers/media/pci/ivtv/ivtvfb.c
index 66be490ec563..800b3654cac5 100644
--- a/drivers/media/pci/ivtv/ivtvfb.c
+++ b/drivers/media/pci/ivtv/ivtvfb.c
@@ -1220,6 +1220,11 @@ static int ivtvfb_init_card(struct ivtv *itv)
 
         /* Allocate DMA */
         ivtv_udma_alloc(itv);
+        itv->streams[IVTV_DEC_STREAM_TYPE_YUV].vdev.device_caps |=
+                V4L2_CAP_VIDEO_OUTPUT_OVERLAY;
+        itv->streams[IVTV_DEC_STREAM_TYPE_MPG].vdev.device_caps |=
+                V4L2_CAP_VIDEO_OUTPUT_OVERLAY;
+        itv->v4l2_cap |= V4L2_CAP_VIDEO_OUTPUT_OVERLAY;
         return 0;
 
 }
@@ -1246,6 +1251,11 @@ static int ivtvfb_callback_cleanup(struct device *dev, void *p)
         struct osd_info *oi = itv->osd_info;
 
         if (itv->v4l2_cap & V4L2_CAP_VIDEO_OUTPUT) {
+                itv->streams[IVTV_DEC_STREAM_TYPE_YUV].vdev.device_caps &=
+                        ~V4L2_CAP_VIDEO_OUTPUT_OVERLAY;
+                itv->streams[IVTV_DEC_STREAM_TYPE_MPG].vdev.device_caps &=
+                        ~V4L2_CAP_VIDEO_OUTPUT_OVERLAY;
+                itv->v4l2_cap &= ~V4L2_CAP_VIDEO_OUTPUT_OVERLAY;
                 if (unregister_framebuffer(&itv->osd_info->ivtvfb_info)) {
                         IVTVFB_WARN("Framebuffer %d is in use, cannot unload\n",
                                        itv->instance);