mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-30 22:26:55 +00:00
media: mtk-jpeg: Fix timeout schedule error in mtk_jpegdec_worker.
In mtk_jpegdec_worker, if error occurs in mtk_jpeg_set_dec_dst, it
will start the timeout worker and invoke v4l2_m2m_job_finish at
the same time. This will break the logic of design for there should
be only one function to call v4l2_m2m_job_finish. But now the timeout
handler and mtk_jpegdec_worker will both invoke it.
Fix it by start the worker only if mtk_jpeg_set_dec_dst successfully
finished.
Fixes: da4ede4b7f
("media: mtk-jpeg: move data/code inside CONFIG_OF blocks")
Signed-off-by: Zheng Wang <zyytlz.wz@163.com>
Signed-off-by: Dmitry Osipenko <dmitry.osipenko@collabora.com>
Cc: stable@vger.kernel.org
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
This commit is contained in:
parent
206c857dd1
commit
38e1857933
1 changed files with 3 additions and 3 deletions
|
@ -1748,9 +1748,6 @@ static void mtk_jpegdec_worker(struct work_struct *work)
|
|||
v4l2_m2m_src_buf_remove(ctx->fh.m2m_ctx);
|
||||
v4l2_m2m_dst_buf_remove(ctx->fh.m2m_ctx);
|
||||
|
||||
schedule_delayed_work(&comp_jpeg[hw_id]->job_timeout_work,
|
||||
msecs_to_jiffies(MTK_JPEG_HW_TIMEOUT_MSEC));
|
||||
|
||||
mtk_jpeg_set_dec_src(ctx, &src_buf->vb2_buf, &bs);
|
||||
if (mtk_jpeg_set_dec_dst(ctx,
|
||||
&jpeg_src_buf->dec_param,
|
||||
|
@ -1760,6 +1757,9 @@ static void mtk_jpegdec_worker(struct work_struct *work)
|
|||
goto setdst_end;
|
||||
}
|
||||
|
||||
schedule_delayed_work(&comp_jpeg[hw_id]->job_timeout_work,
|
||||
msecs_to_jiffies(MTK_JPEG_HW_TIMEOUT_MSEC));
|
||||
|
||||
spin_lock_irqsave(&comp_jpeg[hw_id]->hw_lock, flags);
|
||||
ctx->total_frame_num++;
|
||||
mtk_jpeg_dec_reset(comp_jpeg[hw_id]->reg_base);
|
||||
|
|
Loading…
Reference in a new issue