Skip to content
Snippets Groups Projects
Commit abf5eab6 authored by Mirela Rabulea's avatar Mirela Rabulea Committed by Leonard Crestez
Browse files

MLK-20889: mxc-jpeg: Jpeg decoder gets stuck with gplay & short yuv422 mjpeg video


Unlock hw_lock before calling v4l2_m2m_job_finish to avoid deadlock:
v4l2_m2m_job_finish -> v4l2_m2m_try_schedule -> job_ready locks hw_lock
v4l2_m2m_job_finish -> v4l2_m2m_try_run -> device_run locks hw_lock

Signed-off-by: default avatarMirela Rabulea <mirela.rabulea@nxp.com>
Reviewed-by: default avatarLaurentiu Palcu <laurentiu.palcu@nxp.com>
parent bbd225e9
No related branches found
No related tags found
No related merge requests found
...@@ -498,7 +498,9 @@ buffers_done: ...@@ -498,7 +498,9 @@ buffers_done:
v4l2_m2m_dst_buf_remove(ctx->fh.m2m_ctx); v4l2_m2m_dst_buf_remove(ctx->fh.m2m_ctx);
v4l2_m2m_buf_done(to_vb2_v4l2_buffer(src_buf), buf_state); v4l2_m2m_buf_done(to_vb2_v4l2_buffer(src_buf), buf_state);
v4l2_m2m_buf_done(to_vb2_v4l2_buffer(dst_buf), buf_state); v4l2_m2m_buf_done(to_vb2_v4l2_buffer(dst_buf), buf_state);
spin_unlock(&jpeg->hw_lock);
v4l2_m2m_job_finish(jpeg->m2m_dev, ctx->fh.m2m_ctx); v4l2_m2m_job_finish(jpeg->m2m_dev, ctx->fh.m2m_ctx);
return IRQ_HANDLED;
job_unlock: job_unlock:
spin_unlock(&jpeg->hw_lock); spin_unlock(&jpeg->hw_lock);
return IRQ_HANDLED; return IRQ_HANDLED;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment