1 files changed, 99 insertions, 60 deletions

diff --git a/drivers/media/pci/ivtv/ivtv-ioctl.c b/drivers/media/pci/ivtv/ivtv-ioctl.c
index 4d8ee18c3feb..6fe6c4a0e858 100644
--- a/drivers/media/pci/ivtv/ivtv-ioctl.c
+++ b/drivers/media/pci/ivtv/ivtv-ioctl.c
@@ -448,9 +448,12 @@ static int ivtv_g_fmt_vid_out(struct file *file, void *fh, struct v4l2_format *f
 static int ivtv_g_fmt_vid_out_overlay(struct file *file, void *fh, struct v4l2_format *fmt)
 {
         struct ivtv *itv = fh2id(fh)->itv;
+        struct ivtv_stream *s = &itv->streams[fh2id(fh)->type];
         struct v4l2_window *winfmt = &fmt->fmt.win;
 
-        if (!(itv->v4l2_cap & V4L2_CAP_VIDEO_OUTPUT))
+        if (!(s->caps & V4L2_CAP_VIDEO_OUTPUT_OVERLAY))
+                return -EINVAL;
+        if (!itv->osd_video_pbase)
                 return -EINVAL;
         winfmt->chromakey = itv->osd_chroma_key;
         winfmt->global_alpha = itv->osd_global_alpha;
@@ -555,10 +558,13 @@ static int ivtv_try_fmt_vid_out(struct file *file, void *fh, struct v4l2_format
 static int ivtv_try_fmt_vid_out_overlay(struct file *file, void *fh, struct v4l2_format *fmt)
 {
         struct ivtv *itv = fh2id(fh)->itv;
+        struct ivtv_stream *s = &itv->streams[fh2id(fh)->type];
         u32 chromakey = fmt->fmt.win.chromakey;
         u8 global_alpha = fmt->fmt.win.global_alpha;
 
-        if (!(itv->v4l2_cap & V4L2_CAP_VIDEO_OUTPUT))
+        if (!(s->caps & V4L2_CAP_VIDEO_OUTPUT_OVERLAY))
+                return -EINVAL;
+        if (!itv->osd_video_pbase)
                 return -EINVAL;
         ivtv_g_fmt_vid_out_overlay(file, fh, fmt);
         fmt->fmt.win.chromakey = chromakey;
@@ -741,6 +747,11 @@ static int ivtv_querycap(struct file *file, void *fh, struct v4l2_capability *vc
         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;
 }
 
@@ -816,80 +827,103 @@ static int ivtv_cropcap(struct file *file, void *fh, struct v4l2_cropcap *cropca
 {
         struct ivtv_open_id *id = fh2id(fh);
         struct ivtv *itv = id->itv;
-        struct yuv_playback_info *yi = &itv->yuv_info;
-        int streamtype;
-
-        streamtype = id->type;
 
-        if (cropcap->type != V4L2_BUF_TYPE_VIDEO_OUTPUT)
-                return -EINVAL;
-        cropcap->bounds.top = cropcap->bounds.left = 0;
-        cropcap->bounds.width = 720;
         if (cropcap->type == V4L2_BUF_TYPE_VIDEO_CAPTURE) {
-                cropcap->bounds.height = itv->is_50hz ? 576 : 480;
                 cropcap->pixelaspect.numerator = itv->is_50hz ? 59 : 10;
                 cropcap->pixelaspect.denominator = itv->is_50hz ? 54 : 11;
-        } else if (streamtype == IVTV_DEC_STREAM_TYPE_YUV) {
-                if (yi->track_osd) {
-                        cropcap->bounds.width = yi->osd_full_w;
-                        cropcap->bounds.height = yi->osd_full_h;
-                } else {
-                        cropcap->bounds.width = 720;
-                        cropcap->bounds.height =
-                                        itv->is_out_50hz ? 576 : 480;
-                }
+        } else if (cropcap->type == V4L2_BUF_TYPE_VIDEO_OUTPUT) {
                 cropcap->pixelaspect.numerator = itv->is_out_50hz ? 59 : 10;
                 cropcap->pixelaspect.denominator = itv->is_out_50hz ? 54 : 11;
         } else {
-                cropcap->bounds.height = itv->is_out_50hz ? 576 : 480;
-                cropcap->pixelaspect.numerator = itv->is_out_50hz ? 59 : 10;
-                cropcap->pixelaspect.denominator = itv->is_out_50hz ? 54 : 11;
+                return -EINVAL;
         }
-        cropcap->defrect = cropcap->bounds;
         return 0;
 }
 
-static int ivtv_s_crop(struct file *file, void *fh, const struct v4l2_crop *crop)
+static int ivtv_s_selection(struct file *file, void *fh,
+                            struct v4l2_selection *sel)
 {
         struct ivtv_open_id *id = fh2id(fh);
         struct ivtv *itv = id->itv;
         struct yuv_playback_info *yi = &itv->yuv_info;
-        int streamtype;
+        struct v4l2_rect r = { 0, 0, 720, 0 };
+        int streamtype = id->type;
 
-        streamtype = id->type;
+        if (sel->type != V4L2_BUF_TYPE_VIDEO_OUTPUT ||
+            !(itv->v4l2_cap & V4L2_CAP_VIDEO_OUTPUT))
+                return -EINVAL;
 
-        if (crop->type == V4L2_BUF_TYPE_VIDEO_OUTPUT &&
-            (itv->v4l2_cap & V4L2_CAP_VIDEO_OUTPUT)) {
-                if (streamtype == IVTV_DEC_STREAM_TYPE_YUV) {
-                        yi->main_rect = crop->c;
-                        return 0;
-                } else {
-                        if (!ivtv_vapi(itv, CX2341X_OSD_SET_FRAMEBUFFER_WINDOW, 4,
-                                crop->c.width, crop->c.height, crop->c.left, crop->c.top)) {
-                                itv->main_rect = crop->c;
-                                return 0;
-                        }
-                }
+        if (sel->target != V4L2_SEL_TGT_COMPOSE)
                 return -EINVAL;
+
+
+        if (sel->type != V4L2_BUF_TYPE_VIDEO_OUTPUT ||
+            !(itv->v4l2_cap & V4L2_CAP_VIDEO_OUTPUT))
+                return -EINVAL;
+
+        r.height = itv->is_out_50hz ? 576 : 480;
+        if (streamtype == IVTV_DEC_STREAM_TYPE_YUV && yi->track_osd) {
+                r.width = yi->osd_full_w;
+                r.height = yi->osd_full_h;
+        }
+        sel->r.width = clamp(sel->r.width, 16U, r.width);
+        sel->r.height = clamp(sel->r.height, 16U, r.height);
+        sel->r.left = clamp_t(unsigned, sel->r.left, 0, r.width - sel->r.width);
+        sel->r.top = clamp_t(unsigned, sel->r.top, 0, r.height - sel->r.height);
+
+        if (streamtype == IVTV_DEC_STREAM_TYPE_YUV) {
+                yi->main_rect = sel->r;
+                return 0;
+        }
+        if (!ivtv_vapi(itv, CX2341X_OSD_SET_FRAMEBUFFER_WINDOW, 4,
+                        sel->r.width, sel->r.height, sel->r.left, sel->r.top)) {
+                itv->main_rect = sel->r;
+                return 0;
         }
         return -EINVAL;
 }
 
-static int ivtv_g_crop(struct file *file, void *fh, struct v4l2_crop *crop)
+static int ivtv_g_selection(struct file *file, void *fh,
+                            struct v4l2_selection *sel)
 {
         struct ivtv_open_id *id = fh2id(fh);
         struct ivtv *itv = id->itv;
         struct yuv_playback_info *yi = &itv->yuv_info;
-        int streamtype;
+        struct v4l2_rect r = { 0, 0, 720, 0 };
+        int streamtype = id->type;
+
+        if (sel->type == V4L2_BUF_TYPE_VIDEO_CAPTURE) {
+                switch (sel->target) {
+                case V4L2_SEL_TGT_CROP_DEFAULT:
+                case V4L2_SEL_TGT_CROP_BOUNDS:
+                        sel->r.top = sel->r.left = 0;
+                        sel->r.width = 720;
+                        sel->r.height = itv->is_50hz ? 576 : 480;
+                        return 0;
+                default:
+                        return -EINVAL;
+                }
+        }
 
-        streamtype = id->type;
+        if (sel->type != V4L2_BUF_TYPE_VIDEO_OUTPUT ||
+            !(itv->v4l2_cap & V4L2_CAP_VIDEO_OUTPUT))
+                return -EINVAL;
 
-        if (crop->type == V4L2_BUF_TYPE_VIDEO_OUTPUT &&
-            (itv->v4l2_cap & V4L2_CAP_VIDEO_OUTPUT)) {
+        switch (sel->target) {
+        case V4L2_SEL_TGT_COMPOSE:
                 if (streamtype == IVTV_DEC_STREAM_TYPE_YUV)
-                        crop->c = yi->main_rect;
+                        sel->r = yi->main_rect;
                 else
-                        crop->c = itv->main_rect;
+                        sel->r = itv->main_rect;
+                return 0;
+        case V4L2_SEL_TGT_COMPOSE_DEFAULT:
+        case V4L2_SEL_TGT_COMPOSE_BOUNDS:
+                r.height = itv->is_out_50hz ? 576 : 480;
+                if (streamtype == IVTV_DEC_STREAM_TYPE_YUV && yi->track_osd) {
+                        r.width = yi->osd_full_w;
+                        r.height = yi->osd_full_h;
+                }
+                sel->r = r;
                 return 0;
         }
         return -EINVAL;
@@ -987,7 +1021,7 @@ int ivtv_s_input(struct file *file, void *fh, unsigned int inp)
         else
                 std = V4L2_STD_ALL;
         for (i = 0; i <= IVTV_ENC_STREAM_TYPE_VBI; i++)
-                itv->streams[i].vdev->tvnorms = std;
+                itv->streams[i].vdev.tvnorms = std;
 
         /* prevent others from messing with the streams until
            we're finished changing inputs. */
@@ -1038,7 +1072,7 @@ static int ivtv_g_frequency(struct file *file, void *fh, struct v4l2_frequency *
         struct ivtv *itv = fh2id(fh)->itv;
         struct ivtv_stream *s = &itv->streams[fh2id(fh)->type];
 
-        if (s->vdev->vfl_dir)
+        if (s->vdev.vfl_dir)
                 return -ENOTTY;
         if (vf->tuner != 0)
                 return -EINVAL;
@@ -1052,7 +1086,7 @@ int ivtv_s_frequency(struct file *file, void *fh, const struct v4l2_frequency *v
         struct ivtv *itv = fh2id(fh)->itv;
         struct ivtv_stream *s = &itv->streams[fh2id(fh)->type];
 
-        if (s->vdev->vfl_dir)
+        if (s->vdev.vfl_dir)
                 return -ENOTTY;
         if (vf->tuner != 0)
                 return -EINVAL;
@@ -1340,6 +1374,7 @@ static int ivtv_try_encoder_cmd(struct file *file, void *fh, struct v4l2_encoder
 static int ivtv_g_fbuf(struct file *file, void *fh, struct v4l2_framebuffer *fb)
 {
         struct ivtv *itv = fh2id(fh)->itv;
+        struct ivtv_stream *s = &itv->streams[fh2id(fh)->type];
         u32 data[CX2341X_MBOX_MAX_DATA];
         struct yuv_playback_info *yi = &itv->yuv_info;
 
@@ -1363,10 +1398,10 @@ static int ivtv_g_fbuf(struct file *file, void *fh, struct v4l2_framebuffer *fb)
                 0,
         };
 
-        if (!(itv->v4l2_cap & V4L2_CAP_VIDEO_OUTPUT_OVERLAY))
-                return -EINVAL;
+        if (!(s->caps & V4L2_CAP_VIDEO_OUTPUT_OVERLAY))
+                return -ENOTTY;
         if (!itv->osd_video_pbase)
-                return -EINVAL;
+                return -ENOTTY;
 
         fb->capability = V4L2_FBUF_CAP_EXTERNOVERLAY | V4L2_FBUF_CAP_CHROMAKEY |
                 V4L2_FBUF_CAP_GLOBAL_ALPHA;
@@ -1427,12 +1462,13 @@ static int ivtv_s_fbuf(struct file *file, void *fh, const struct v4l2_framebuffe
 {
         struct ivtv_open_id *id = fh2id(fh);
         struct ivtv *itv = id->itv;
+        struct ivtv_stream *s = &itv->streams[fh2id(fh)->type];
         struct yuv_playback_info *yi = &itv->yuv_info;
 
-        if (!(itv->v4l2_cap & V4L2_CAP_VIDEO_OUTPUT_OVERLAY))
-                return -EINVAL;
+        if (!(s->caps & V4L2_CAP_VIDEO_OUTPUT_OVERLAY))
+                return -ENOTTY;
         if (!itv->osd_video_pbase)
-                return -EINVAL;
+                return -ENOTTY;
 
         itv->osd_global_alpha_state = (fb->flags & V4L2_FBUF_FLAG_GLOBAL_ALPHA) != 0;
         itv->osd_local_alpha_state =
@@ -1447,9 +1483,12 @@ static int ivtv_overlay(struct file *file, void *fh, unsigned int on)
 {
         struct ivtv_open_id *id = fh2id(fh);
         struct ivtv *itv = id->itv;
+        struct ivtv_stream *s = &itv->streams[fh2id(fh)->type];
 
-        if (!(itv->v4l2_cap & V4L2_CAP_VIDEO_OUTPUT_OVERLAY))
-                return -EINVAL;
+        if (!(s->caps & V4L2_CAP_VIDEO_OUTPUT_OVERLAY))
+                return -ENOTTY;
+        if (!itv->osd_video_pbase)
+                return -ENOTTY;
 
         ivtv_vapi(itv, CX2341X_OSD_SET_STATE, 1, on != 0);
 
@@ -1547,7 +1586,7 @@ static int ivtv_log_status(struct file *file, void *fh)
         for (i = 0; i < IVTV_MAX_STREAMS; i++) {
                 struct ivtv_stream *s = &itv->streams[i];
 
-                if (s->vdev == NULL || s->buffers == 0)
+                if (s->vdev.v4l2_dev == NULL || s->buffers == 0)
                         continue;
                 IVTV_INFO("Stream %s: status 0x%04lx, %d%% of %d KiB (%d buffers) in use\n", s->name, s->s_flags,
                                 (s->buffers - s->q_free.buffers) * 100 / s->buffers,
@@ -1837,8 +1876,8 @@ static const struct v4l2_ioctl_ops ivtv_ioctl_ops = {
         .vidioc_enum_output                 = ivtv_enum_output,
         .vidioc_enumaudout                  = ivtv_enumaudout,
         .vidioc_cropcap                     = ivtv_cropcap,
-        .vidioc_s_crop                      = ivtv_s_crop,
-        .vidioc_g_crop                      = ivtv_g_crop,
+        .vidioc_s_selection                 = ivtv_s_selection,
+        .vidioc_g_selection                 = ivtv_g_selection,
         .vidioc_g_input                     = ivtv_g_input,
         .vidioc_s_input                     = ivtv_s_input,
         .vidioc_g_output                    = ivtv_g_output,