lkml.org 
[lkml]   [2023]   [Jan]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH] media: meson: vdec: esparser: check parsing state with hardware write pointer
On 23/01/2023 10:43, Christian Hewitt wrote:
> From: Neil Armstrong <narmstrong@baylibre.com>
>
> Also check the hardware write pointer to check if ES Parser has stalled.
>
> Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
> Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
> ---
> drivers/staging/media/meson/vdec/esparser.c | 15 +++++++++++----
> 1 file changed, 11 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/staging/media/meson/vdec/esparser.c b/drivers/staging/media/meson/vdec/esparser.c
> index df5956c6141d..41b705f999b2 100644
> --- a/drivers/staging/media/meson/vdec/esparser.c
> +++ b/drivers/staging/media/meson/vdec/esparser.c
> @@ -300,6 +300,7 @@ esparser_queue(struct amvdec_session *sess, struct vb2_v4l2_buffer *vbuf)
> u32 num_dst_bufs = 0;
> u32 offset;
> u32 pad_size;
> + u32 wp, wp2;
>
> /*
> * When max ref frame is held by VP9, this should be -= 3 to prevent a
> @@ -354,15 +355,21 @@ esparser_queue(struct amvdec_session *sess, struct vb2_v4l2_buffer *vbuf)
> }
>
> pad_size = esparser_pad_start_code(core, vb, payload_size);
> + wp = amvdec_read_parser(core, PARSER_VIDEO_WP);
> ret = esparser_write_data(core, phy, payload_size + pad_size);
> + wp2 = amvdec_read_parser(core, PARSER_VIDEO_WP);
>
> if (ret <= 0) {
> - dev_warn(core->dev, "esparser: input parsing error\n");
> - amvdec_remove_ts(sess, vb->timestamp);
> - v4l2_m2m_buf_done(vbuf, VB2_BUF_STATE_ERROR);
> amvdec_write_parser(core, PARSER_FETCH_CMD, 0);
>
> - return 0;
> + if (ret < 0 || wp2 == wp) {
> + dev_err(core->dev, "esparser: input parsing error ret %d (%x <=> %x)\n",
> + ret, wp, wp2);
> + amvdec_remove_ts(sess, vb->timestamp);
> + v4l2_m2m_buf_done(vbuf, VB2_BUF_STATE_ERROR);
> +
> + return 0;
> + }
> }
>
> atomic_inc(&sess->esparser_queued_bufs);

It's weird, but:

Acked-by: Neil Armstrong <neil.armstrong@linaro.org>

Thanks Christian for handling those changes

Neil

\
 
 \ /
  Last update: 2023-03-26 23:52    [W:0.047 / U:0.016 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site