redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

media: v4l2-mem2mem: Fix hold buf flag checks 

Hold buf flag is set on output queue, not capture. Fix that.

Fixes: f07602ac38 ("media: v4l2-mem2mem: add new_frame detection")
Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
alistair/sunxi64-5.5-dsi
Jernej Skrabec 2019-11-06 08:02:53 +01:00 committed by Mauro Carvalho Chehab
parent 3ea35d5db4
commit 1076df3a77
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/media/v4l2-core/v4l2-mem2mem.c
View File

@ -335,7 +335,7 @@ static void __v4l2_m2m_try_queue(struct v4l2_m2m_dev *m2m_dev,
}
}
if (src && dst && (m2m_ctx->cap_q_ctx.q.subsystem_flags &
if (src && dst && (m2m_ctx->out_q_ctx.q.subsystem_flags &
VB2_V4L2_FL_SUPPORTS_M2M_HOLD_CAPTURE_BUF))
m2m_ctx->new_frame = !dst->vb2_buf.copied_timestamp ||
dst->vb2_buf.timestamp != src->vb2_buf.timestamp;
@ -474,7 +474,7 @@ void v4l2_m2m_job_finish(struct v4l2_m2m_dev *m2m_dev,
* holding capture buffers. Those should use
* v4l2_m2m_buf_done_and_job_finish() instead.
*/
WARN_ON(m2m_ctx->cap_q_ctx.q.subsystem_flags &
WARN_ON(m2m_ctx->out_q_ctx.q.subsystem_flags &
VB2_V4L2_FL_SUPPORTS_M2M_HOLD_CAPTURE_BUF);
spin_lock_irqsave(&m2m_dev->job_spinlock, flags);
schedule_next = _v4l2_m2m_job_finish(m2m_dev, m2m_ctx);