media: mgb4: Fix inconsistent input/output alignment in loopback mode

Fixes broken output due to different input/output alignment in loopback
mode when the (last) input device is closed. Instead of on device close,
do the alignment synchronisation when starting the stream (and clear
it when streaming is stopped).

Signed-off-by: Martin Tůma <martin.tuma@digiteqautomotive.com>
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>

diff --git a/drivers/media/pci/mgb4/mgb4_vin.c b/drivers/media/pci/mgb4/mgb4_vin.c
index e34d02d..3f171c6 100644 (file)
--- a/drivers/media/pci/mgb4/mgb4_vin.c
+++ b/drivers/media/pci/mgb4/mgb4_vin.c
@@ -260,6 +260,7 @@ static void buffer_queue(struct vb2_buffer *vb)
 static void stop_streaming(struct vb2_queue *vq)
 {
        struct mgb4_vin_dev *vindev = vb2_get_drv_priv(vq);
+       struct mgb4_regs *video = &vindev->mgbdev->video;
        const struct mgb4_vin_config *config = vindev->config;
        int irq = xdma_get_user_irq(vindev->mgbdev->xdev, config->vin_irq);
 
@@ -273,6 +274,9 @@ static void stop_streaming(struct vb2_queue *vq)
                mgb4_mask_reg(&vindev->mgbdev->video, config->regs.config, 0x2,
                              0x0);
 
+       mgb4_write_reg(video, vindev->config->regs.padding, 0);
+       set_loopback_padding(vindev, 0);
+
        cancel_work_sync(&vindev->dma_work);
        return_all_buffers(vindev, VB2_BUF_STATE_ERROR);
 }
@@ -280,6 +284,7 @@ static void stop_streaming(struct vb2_queue *vq)
 static int start_streaming(struct vb2_queue *vq, unsigned int count)
 {
        struct mgb4_vin_dev *vindev = vb2_get_drv_priv(vq);
+       struct mgb4_regs *video = &vindev->mgbdev->video;
        const struct mgb4_vin_config *config = vindev->config;
        int irq = xdma_get_user_irq(vindev->mgbdev->xdev, config->vin_irq);
 
@@ -292,6 +297,9 @@ static int start_streaming(struct vb2_queue *vq, unsigned int count)
                mgb4_mask_reg(&vindev->mgbdev->video, config->regs.config, 0x2,
                              0x2);
 
+       mgb4_write_reg(video, vindev->config->regs.padding, vindev->padding);
+       set_loopback_padding(vindev, vindev->padding);
+
        xdma_enable_user_irq(vindev->mgbdev->xdev, irq);
 
        return 0;
@@ -322,34 +330,16 @@ static int fh_open(struct file *file)
 
        if (get_timings(vindev, &vindev->timings) < 0)
                vindev->timings = cea1080p60;
-       set_loopback_padding(vindev, vindev->padding);
 
 out:
        mutex_unlock(&vindev->lock);
        return rv;
 }
 
-static int fh_release(struct file *file)
-{
-       struct mgb4_vin_dev *vindev = video_drvdata(file);
-       int rv;
-
-       mutex_lock(&vindev->lock);
-
-       if (v4l2_fh_is_singular_file(file))
-               set_loopback_padding(vindev, 0);
-
-       rv = _vb2_fop_release(file, NULL);
-
-       mutex_unlock(&vindev->lock);
-
-       return rv;
-}
-
 static const struct v4l2_file_operations video_fops = {
        .owner = THIS_MODULE,
        .open = fh_open,
-       .release = fh_release,
+       .release = vb2_fop_release,
        .unlocked_ioctl = video_ioctl2,
        .read = vb2_fop_read,
        .mmap = vb2_fop_mmap,
@@ -505,8 +495,6 @@ static int vidioc_s_fmt(struct file *file, void *priv, struct v4l2_format *f)
 
        vindev->padding = (f->fmt.pix.bytesperline - (f->fmt.pix.width
                           * pixelsize)) / pixelsize;
-       mgb4_write_reg(video, vindev->config->regs.padding, vindev->padding);
-       set_loopback_padding(vindev, vindev->padding);
 
        return 0;
 }