media: v4l2-mem2mem: return CAPTURE buffer first

When the request API is used, typically an OUTPUT (src) buffer
will be part of a request. A userspace process will be typically
blocked, waiting on the request file descriptor.

Returning the OUTPUT (src) buffer will wake-up such processes,
who will immediately attempt to dequeue the CAPTURE buffer,
only to find it's still unavailable.

Therefore, change v4l2_m2m_buf_done_and_job_finish returning
the CAPTURE (dst) buffer first, to avoid signalling the request
file descriptor prematurely, i.e. before the CAPTURE buffer is done.

When the request API is not used, this change should have
no impact.

Tested-by: Nicolas Dufresne <nicolas.dufresne@collabora.com>
Signed-off-by: Ezequiel Garcia <ezequiel@collabora.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

diff --git a/drivers/media/v4l2-core/v4l2-mem2mem.c b/drivers/media/v4l2-core/v4l2-mem2mem.c
index 8986c31176e94160ff83fe53ab169fbf9fa4276b..62ac9424c92a754b8602d20440dacc4a4900bd5f 100644 (file)
--- a/drivers/media/v4l2-core/v4l2-mem2mem.c
+++ b/drivers/media/v4l2-core/v4l2-mem2mem.c
@@ -504,12 +504,21 @@ void v4l2_m2m_buf_done_and_job_finish(struct v4l2_m2m_dev *m2m_dev,
 
        if (WARN_ON(!src_buf || !dst_buf))
                goto unlock;
-       v4l2_m2m_buf_done(src_buf, state);
        dst_buf->is_held = src_buf->flags & V4L2_BUF_FLAG_M2M_HOLD_CAPTURE_BUF;
        if (!dst_buf->is_held) {
                v4l2_m2m_dst_buf_remove(m2m_ctx);
                v4l2_m2m_buf_done(dst_buf, state);
        }
+       /*
+        * If the request API is being used, returning the OUTPUT
+        * (src) buffer will wake-up any process waiting on the
+        * request file descriptor.
+        *
+        * Therefore, return the CAPTURE (dst) buffer first,
+        * to avoid signalling the request file descriptor
+        * before the CAPTURE buffer is done.
+        */
+       v4l2_m2m_buf_done(src_buf, state);
        schedule_next = _v4l2_m2m_job_finish(m2m_dev, m2m_ctx);
 unlock:
        spin_unlock_irqrestore(&m2m_dev->job_spinlock, flags);