From: Dafna Hirschfeld <dafna.hirschfeld@collabora.com> To: linux-media@vger.kernel.org Cc: Dafna Hirschfeld <dafna.hirschfeld@collabora.com>, kernel@collabora.com, acourbot@chromium.org, andrew-ct.chen@mediatek.com, courbot@chromium.org, dafna3@gmail.com, eizan@chromium.org, houlong.wei@mediatek.com, hsinyi@chromium.org, hverkuil@xs4all.nl, irui.wang@mediatek.com, linux-kernel@vger.kernel.org, linux-mediatek@lists.infradead.org, maoguang.meng@mediatek.com, matthias.bgg@gmail.com, mchehab@kernel.org, minghsiu.tsai@mediatek.com, tfiga@chromium.org, tiffany.lin@mediatek.com Subject: [PATCH v2 3/7] media: mtk-vcodec: enc: use "stream_started" flag for "stop/start_streaming" Date: Wed, 17 Nov 2021 15:06:31 +0200 [thread overview] Message-ID: <20211117130635.11633-4-dafna.hirschfeld@collabora.com> (raw) In-Reply-To: <20211117130635.11633-1-dafna.hirschfeld@collabora.com> Currently the mtk-vcodec encoder does runtime pm resume in "start_streaming" cb if both queues are streaming and does runtime pm 'put' in "stop_streaming" if both queues are not streaming. This is wrong since the same queue might be started and then stopped causing the driver to turn off the hardware without turning it on. This cause for example unbalanced calls to pm_runtime_* Fixes: 4e855a6efa547 ("[media] vcodec: mediatek: Add Mediatek V4L2 Video Encoder Driver") Signed-off-by: Dafna Hirschfeld <dafna.hirschfeld@collabora.com> --- to reproduce the issue: patch v4l-utils as follow: static void stateful_m2m(cv4l_fd &fd, cv4l_queue &in, cv4l_queue &out, if (fd.streamon(out.g_type())) return; + if (fd.streamoff(out.g_type())) + return; + + exit(1); fd.s_trace(0); if (exp_fd_p) and call: v4l2-ctl -x width=160,height=128,pixelformat=NM12 -v pixelformat=VP80 --stream-mmap --stream-out-mmap -d5 then the file /sys/devices/platform/soc/19002000.vcodec/power/runtime_usage will show a negative number and further streaming (with e.g, gstreamer) is not possible. drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h | 4 ++++ drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c | 8 ++++++++ 2 files changed, 12 insertions(+) diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h b/drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h index 9d36e3d27369..84c5289f872b 100644 --- a/drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h +++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h @@ -259,6 +259,9 @@ struct vdec_pic_info { * @decoded_frame_cnt: number of decoded frames * @lock: protect variables accessed by V4L2 threads and worker thread such as * mtk_video_dec_buf. + * @stream_started: this flag is turned on when both queues (cap and out) starts streaming + * and it is turned off once both queues stop streaming. It is used for a correct + * setup and set-down of the hardware when starting and stopping streaming. */ struct mtk_vcodec_ctx { enum mtk_instance_type type; @@ -301,6 +304,7 @@ struct mtk_vcodec_ctx { int decoded_frame_cnt; struct mutex lock; + bool stream_started; }; diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c b/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c index 87a5114bf680..fb3cf804c96a 100644 --- a/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c +++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c @@ -890,6 +890,9 @@ static int vb2ops_venc_start_streaming(struct vb2_queue *q, unsigned int count) goto err_start_stream; } + if (ctx->stream_started) + return 0; + /* Do the initialization when both start_streaming have been called */ if (V4L2_TYPE_IS_OUTPUT(q->type)) { if (!vb2_start_streaming_called(&ctx->m2m_ctx->cap_q_ctx.q)) @@ -928,6 +931,7 @@ static int vb2ops_venc_start_streaming(struct vb2_queue *q, unsigned int count) ctx->state = MTK_STATE_HEADER; } + ctx->stream_started = true; return 0; err_set_param: @@ -1002,6 +1006,9 @@ static void vb2ops_venc_stop_streaming(struct vb2_queue *q) } } + if (!ctx->stream_started) + return; + if ((q->type == V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE && vb2_is_streaming(&ctx->m2m_ctx->out_q_ctx.q)) || (q->type == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE && @@ -1023,6 +1030,7 @@ static void vb2ops_venc_stop_streaming(struct vb2_queue *q) mtk_v4l2_err("pm_runtime_put fail %d", ret); ctx->state = MTK_STATE_FREE; + ctx->stream_started = false; } static int vb2ops_venc_buf_out_validate(struct vb2_buffer *vb) -- 2.17.1
WARNING: multiple messages have this Message-ID (diff)
From: Dafna Hirschfeld <dafna.hirschfeld@collabora.com> To: linux-media@vger.kernel.org Cc: Dafna Hirschfeld <dafna.hirschfeld@collabora.com>, kernel@collabora.com, acourbot@chromium.org, andrew-ct.chen@mediatek.com, courbot@chromium.org, dafna3@gmail.com, eizan@chromium.org, houlong.wei@mediatek.com, hsinyi@chromium.org, hverkuil@xs4all.nl, irui.wang@mediatek.com, linux-kernel@vger.kernel.org, linux-mediatek@lists.infradead.org, maoguang.meng@mediatek.com, matthias.bgg@gmail.com, mchehab@kernel.org, minghsiu.tsai@mediatek.com, tfiga@chromium.org, tiffany.lin@mediatek.com Subject: [PATCH v2 3/7] media: mtk-vcodec: enc: use "stream_started" flag for "stop/start_streaming" Date: Wed, 17 Nov 2021 15:06:31 +0200 [thread overview] Message-ID: <20211117130635.11633-4-dafna.hirschfeld@collabora.com> (raw) In-Reply-To: <20211117130635.11633-1-dafna.hirschfeld@collabora.com> Currently the mtk-vcodec encoder does runtime pm resume in "start_streaming" cb if both queues are streaming and does runtime pm 'put' in "stop_streaming" if both queues are not streaming. This is wrong since the same queue might be started and then stopped causing the driver to turn off the hardware without turning it on. This cause for example unbalanced calls to pm_runtime_* Fixes: 4e855a6efa547 ("[media] vcodec: mediatek: Add Mediatek V4L2 Video Encoder Driver") Signed-off-by: Dafna Hirschfeld <dafna.hirschfeld@collabora.com> --- to reproduce the issue: patch v4l-utils as follow: static void stateful_m2m(cv4l_fd &fd, cv4l_queue &in, cv4l_queue &out, if (fd.streamon(out.g_type())) return; + if (fd.streamoff(out.g_type())) + return; + + exit(1); fd.s_trace(0); if (exp_fd_p) and call: v4l2-ctl -x width=160,height=128,pixelformat=NM12 -v pixelformat=VP80 --stream-mmap --stream-out-mmap -d5 then the file /sys/devices/platform/soc/19002000.vcodec/power/runtime_usage will show a negative number and further streaming (with e.g, gstreamer) is not possible. drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h | 4 ++++ drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c | 8 ++++++++ 2 files changed, 12 insertions(+) diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h b/drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h index 9d36e3d27369..84c5289f872b 100644 --- a/drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h +++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h @@ -259,6 +259,9 @@ struct vdec_pic_info { * @decoded_frame_cnt: number of decoded frames * @lock: protect variables accessed by V4L2 threads and worker thread such as * mtk_video_dec_buf. + * @stream_started: this flag is turned on when both queues (cap and out) starts streaming + * and it is turned off once both queues stop streaming. It is used for a correct + * setup and set-down of the hardware when starting and stopping streaming. */ struct mtk_vcodec_ctx { enum mtk_instance_type type; @@ -301,6 +304,7 @@ struct mtk_vcodec_ctx { int decoded_frame_cnt; struct mutex lock; + bool stream_started; }; diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c b/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c index 87a5114bf680..fb3cf804c96a 100644 --- a/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c +++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c @@ -890,6 +890,9 @@ static int vb2ops_venc_start_streaming(struct vb2_queue *q, unsigned int count) goto err_start_stream; } + if (ctx->stream_started) + return 0; + /* Do the initialization when both start_streaming have been called */ if (V4L2_TYPE_IS_OUTPUT(q->type)) { if (!vb2_start_streaming_called(&ctx->m2m_ctx->cap_q_ctx.q)) @@ -928,6 +931,7 @@ static int vb2ops_venc_start_streaming(struct vb2_queue *q, unsigned int count) ctx->state = MTK_STATE_HEADER; } + ctx->stream_started = true; return 0; err_set_param: @@ -1002,6 +1006,9 @@ static void vb2ops_venc_stop_streaming(struct vb2_queue *q) } } + if (!ctx->stream_started) + return; + if ((q->type == V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE && vb2_is_streaming(&ctx->m2m_ctx->out_q_ctx.q)) || (q->type == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE && @@ -1023,6 +1030,7 @@ static void vb2ops_venc_stop_streaming(struct vb2_queue *q) mtk_v4l2_err("pm_runtime_put fail %d", ret); ctx->state = MTK_STATE_FREE; + ctx->stream_started = false; } static int vb2ops_venc_buf_out_validate(struct vb2_buffer *vb) -- 2.17.1 _______________________________________________ Linux-mediatek mailing list Linux-mediatek@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-mediatek
next prev parent reply other threads:[~2021-11-17 13:06 UTC|newest] Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-11-17 13:06 [PATCH v2 0/7] media: mtk-vcodec: few fixes Dafna Hirschfeld 2021-11-17 13:06 ` Dafna Hirschfeld 2021-11-17 13:06 ` [PATCH v2 1/7] media: mtk-vcodec: enc: add vp8 profile ctrl Dafna Hirschfeld 2021-11-17 13:06 ` Dafna Hirschfeld 2021-11-17 13:06 ` [PATCH v2 2/7] media: mtk-vcodec: call v4l2_m2m_ctx_release first when file is released Dafna Hirschfeld 2021-11-17 13:06 ` Dafna Hirschfeld 2021-12-27 7:06 ` Alexandre Courbot 2021-12-27 7:06 ` Alexandre Courbot 2021-11-17 13:06 ` Dafna Hirschfeld [this message] 2021-11-17 13:06 ` [PATCH v2 3/7] media: mtk-vcodec: enc: use "stream_started" flag for "stop/start_streaming" Dafna Hirschfeld 2021-11-25 8:30 ` Hans Verkuil 2021-11-25 8:30 ` Hans Verkuil 2021-11-17 13:06 ` [PATCH v2 4/7] media: mtk-vcodec: fix debugging defines Dafna Hirschfeld 2021-11-17 13:06 ` Dafna Hirschfeld 2021-11-18 16:03 ` kernel test robot 2021-11-18 16:03 ` kernel test robot 2021-11-26 8:11 ` kernel test robot 2021-11-17 13:06 ` [PATCH v2 5/7] media: mtk-vcodec: replace func vidioc_try_fmt with two funcs for out/cap Dafna Hirschfeld 2021-11-17 13:06 ` Dafna Hirschfeld 2021-12-27 7:06 ` Alexandre Courbot 2021-12-27 7:06 ` Alexandre Courbot 2021-11-17 13:06 ` [PATCH v2 6/7] media: mtk-vcodec: don't check return val of mtk_venc_get_q_data Dafna Hirschfeld 2021-11-17 13:06 ` Dafna Hirschfeld 2021-12-27 7:06 ` Alexandre Courbot 2021-12-27 7:06 ` Alexandre Courbot 2021-11-17 13:06 ` [PATCH v2 7/7] meida: mtk-vcodec: remove unused func parameter Dafna Hirschfeld 2021-11-17 13:06 ` Dafna Hirschfeld 2021-11-18 14:35 ` Nicolas Dufresne 2021-11-18 14:35 ` Nicolas Dufresne 2021-12-27 7:06 ` Alexandre Courbot 2021-12-27 7:06 ` Alexandre Courbot
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20211117130635.11633-4-dafna.hirschfeld@collabora.com \ --to=dafna.hirschfeld@collabora.com \ --cc=acourbot@chromium.org \ --cc=andrew-ct.chen@mediatek.com \ --cc=courbot@chromium.org \ --cc=dafna3@gmail.com \ --cc=eizan@chromium.org \ --cc=houlong.wei@mediatek.com \ --cc=hsinyi@chromium.org \ --cc=hverkuil@xs4all.nl \ --cc=irui.wang@mediatek.com \ --cc=kernel@collabora.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-media@vger.kernel.org \ --cc=linux-mediatek@lists.infradead.org \ --cc=maoguang.meng@mediatek.com \ --cc=matthias.bgg@gmail.com \ --cc=mchehab@kernel.org \ --cc=minghsiu.tsai@mediatek.com \ --cc=tfiga@chromium.org \ --cc=tiffany.lin@mediatek.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.