target/linux/bcm27xx/patches-5.4/950-0493-media-v4l2-mem2mem-Fix-hold-buf-flag-checks.patch

   1 From 73d8a76ec5b5e1240af4142a9ccbd39179d779af Mon Sep 17 00:00:00 2001
   2 From: Jernej Skrabec <jernej.skrabec@siol.net>
   3 Date: Wed, 6 Nov 2019 08:02:53 +0100
   4 Subject: [PATCH] media: v4l2-mem2mem: Fix hold buf flag checks
   5
   6 Commit 1076df3a77b490d33429560a9e0603b3673223e2 upstream.
   7
   8 Hold buf flag is set on output queue, not capture. Fix that.
   9
  10 Fixes: f07602ac3887 ("media: v4l2-mem2mem: add new_frame detection")
  11 Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net>
  12 Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
  13 Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
  14 ---
  15  drivers/media/v4l2-core/v4l2-mem2mem.c | 4 ++--
  16  1 file changed, 2 insertions(+), 2 deletions(-)
  17
  18 --- a/drivers/media/v4l2-core/v4l2-mem2mem.c
  19 +++ b/drivers/media/v4l2-core/v4l2-mem2mem.c
  20 @@ -335,7 +335,7 @@ static void __v4l2_m2m_try_queue(struct
  21                 }
  22         }
  23
  24 -       if (src && dst && (m2m_ctx->cap_q_ctx.q.subsystem_flags &
  25 +       if (src && dst && (m2m_ctx->out_q_ctx.q.subsystem_flags &
  26                            VB2_V4L2_FL_SUPPORTS_M2M_HOLD_CAPTURE_BUF))
  27                 m2m_ctx->new_frame = !dst->vb2_buf.copied_timestamp ||
  28                         dst->vb2_buf.timestamp != src->vb2_buf.timestamp;
  29 @@ -474,7 +474,7 @@ void v4l2_m2m_job_finish(struct v4l2_m2m
  30          * holding capture buffers. Those should use
  31          * v4l2_m2m_buf_done_and_job_finish() instead.
  32          */
  33 -       WARN_ON(m2m_ctx->cap_q_ctx.q.subsystem_flags &
  34 +       WARN_ON(m2m_ctx->out_q_ctx.q.subsystem_flags &
  35                 VB2_V4L2_FL_SUPPORTS_M2M_HOLD_CAPTURE_BUF);
  36         spin_lock_irqsave(&m2m_dev->job_spinlock, flags);
  37         schedule_next = _v4l2_m2m_job_finish(m2m_dev, m2m_ctx);