[media] fsl_viu: add VIDIOC_OVERLAY ioctl

Currently the driver enables overlay when running
VIDIOC_S_FMT ioctl with fmt type V4L2_BUF_TYPE_VIDEO_OVERLAY.
Actually, this is wrong. Add proper VIDIOC_OVERLAY support
instead of using VIDIOC_S_FMT for overlay enable.

Signed-off-by: Anatolij Gustschin <agust@denx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/drivers/media/video/fsl-viu.c b/drivers/media/video/fsl-viu.c
index 575f39b3c677f1e85cf32ce4ae6e9679138f1454..ab0e09d391f19b719591ec3ce6614bf909d83643 100644 (file)
--- a/drivers/media/video/fsl-viu.c
+++ b/drivers/media/video/fsl-viu.c
@@ -766,7 +766,7 @@ inline void viu_activate_overlay(struct viu_reg *viu_reg)
        out_be32(&vr->picture_count, reg_val.picture_count);
 }
 
-static int viu_start_preview(struct viu_dev *dev, struct viu_fh *fh)
+static int viu_setup_preview(struct viu_dev *dev, struct viu_fh *fh)
 {
        int bpp;
 
@@ -805,11 +805,6 @@ static int viu_start_preview(struct viu_dev *dev, struct viu_fh *fh)
        /* setup the base address of the overlay buffer */
        reg_val.field_base_addr = (u32)dev->ovbuf.base;
 
-       dev->ovenable = 1;
-       viu_activate_overlay(dev->vr);
-
-       /* start dma */
-       viu_start_dma(dev);
        return 0;
 }
 
@@ -828,7 +823,7 @@ static int vidioc_s_fmt_overlay(struct file *file, void *priv,
        fh->win = f->fmt.win;
 
        spin_lock_irqsave(&dev->slock, flags);
-       viu_start_preview(dev, fh);
+       viu_setup_preview(dev, fh);
        spin_unlock_irqrestore(&dev->slock, flags);
        return 0;
 }
@@ -839,6 +834,28 @@ static int vidioc_try_fmt_overlay(struct file *file, void *priv,
        return 0;
 }
 
+static int vidioc_overlay(struct file *file, void *priv, unsigned int on)
+{
+       struct viu_fh  *fh  = priv;
+       struct viu_dev *dev = (struct viu_dev *)fh->dev;
+       unsigned long  flags;
+
+       if (on) {
+               spin_lock_irqsave(&dev->slock, flags);
+               viu_activate_overlay(dev->vr);
+               dev->ovenable = 1;
+
+               /* start dma */
+               viu_start_dma(dev);
+               spin_unlock_irqrestore(&dev->slock, flags);
+       } else {
+               viu_stop_dma(dev);
+               dev->ovenable = 0;
+       }
+
+       return 0;
+}
+
 int vidioc_g_fbuf(struct file *file, void *priv, struct v4l2_framebuffer *arg)
 {
        struct viu_fh  *fh = priv;
@@ -1414,6 +1431,7 @@ static const struct v4l2_ioctl_ops viu_ioctl_ops = {
        .vidioc_g_fmt_vid_overlay = vidioc_g_fmt_overlay,
        .vidioc_try_fmt_vid_overlay = vidioc_try_fmt_overlay,
        .vidioc_s_fmt_vid_overlay = vidioc_s_fmt_overlay,
+       .vidioc_overlay       = vidioc_overlay,
        .vidioc_g_fbuf        = vidioc_g_fbuf,
        .vidioc_s_fbuf        = vidioc_s_fbuf,
        .vidioc_reqbufs       = vidioc_reqbufs,