Skip to contentSkip to conversation

media: imx-jpeg: Don't clear stop state in handling dynamic resolution change

PATCH New Ming Qian 1 participant 1 message Jul 26, 2022

Subsystems (3)
lore
Share & tools
lore

Ming Qian

author
#0 lore raw

PATCH 1/1 media: imx-jpeg: Don't clear stop state in handling dynamic resolution change

In dynamic resolution change, streamoff and streamon on the capture queue may be called,
the V4L2_DEC_CMD_STOP cmd may be called before driver parsed the jpeg header.
don't clear the stop state in streamoff of handling the dynamic resolution change,
otherwise the drain may not complete.

Fixes 4911c5acf9351 ("media: imx-jpeg: Implement drain using v4l2-mem2mem helpers")
---
 drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.c +2 -1
index fd5a65e577f4..ec13394bdddd 100644
@@ -1278,7 +1278,8 @@ static void mxc_jpeg_stop_streaming(struct vb2_queue *q)
 		v4l2_m2m_buf_done(vbuf, VB2_BUF_STATE_ERROR);
 	}
 
-	v4l2_m2m_update_stop_streaming_state(ctx->fh.m2m_ctx, q);
+	if (V4L2_TYPE_IS_OUTPUT(q->type) || !ctx->source_change)
+		v4l2_m2m_update_stop_streaming_state(ctx->fh.m2m_ctx, q);
 	if (V4L2_TYPE_IS_OUTPUT(q->type) &&
 	    v4l2_m2m_has_stopped(ctx->fh.m2m_ctx)) {
 		notify_eos(ctx);
Signature · 1 line
2.36.1