From: Ezequiel Garcia <ezequiel@collabora.com>
To: linux-media@vger.kernel.org, linux-rockchip@lists.infradead.org,
linux-kernel@vger.kernel.org
Cc: Tomasz Figa <tfiga@chromium.org>,
Nicolas Dufresne <nicolas@ndufresne.ca>,
kernel@collabora.com, Jonas Karlman <jonas@kwiboo.se>,
Heiko Stuebner <heiko@sntech.de>,
Hans Verkuil <hverkuil@xs4all.nl>,
Alexandre Courbot <acourbot@chromium.org>,
Jeffrey Kardatzke <jkardatzke@chromium.org>,
Rob Herring <robh@kernel.org>,
Ezequiel Garcia <ezequiel@collabora.com>
Subject: [PATCH v2 3/8] hantro: Use v4l2_m2m_buf_done_and_job_finish
Date: Wed, 18 Mar 2020 10:21:03 -0300 [thread overview]
Message-ID: <20200318132108.21873-4-ezequiel@collabora.com> (raw)
In-Reply-To: <20200318132108.21873-1-ezequiel@collabora.com>
Let the core sort out the nuances of returning buffers
to userspace, by using the v4l2_m2m_buf_done_and_job_finish
helper.
This change also removes usage of buffer sequence fields,
which shouldn't have any meaning for stateless decoders.
Signed-off-by: Ezequiel Garcia <ezequiel@collabora.com>
---
drivers/staging/media/hantro/hantro_drv.c | 27 ++++++++---------------
1 file changed, 9 insertions(+), 18 deletions(-)
diff --git a/drivers/staging/media/hantro/hantro_drv.c b/drivers/staging/media/hantro/hantro_drv.c
index 0b1200fc0e1a..ec889d755cd6 100644
--- a/drivers/staging/media/hantro/hantro_drv.c
+++ b/drivers/staging/media/hantro/hantro_drv.c
@@ -94,32 +94,23 @@ static void hantro_job_finish(struct hantro_dev *vpu,
unsigned int bytesused,
enum vb2_buffer_state result)
{
- struct vb2_v4l2_buffer *src, *dst;
int ret;
pm_runtime_mark_last_busy(vpu->dev);
pm_runtime_put_autosuspend(vpu->dev);
clk_bulk_disable(vpu->variant->num_clocks, vpu->clocks);
- src = v4l2_m2m_src_buf_remove(ctx->fh.m2m_ctx);
- dst = v4l2_m2m_dst_buf_remove(ctx->fh.m2m_ctx);
-
- if (WARN_ON(!src))
- return;
- if (WARN_ON(!dst))
- return;
-
- src->sequence = ctx->sequence_out++;
- dst->sequence = ctx->sequence_cap++;
-
- ret = ctx->buf_finish(ctx, &dst->vb2_buf, bytesused);
- if (ret)
- result = VB2_BUF_STATE_ERROR;
+ if (ctx->buf_finish) {
+ struct vb2_v4l2_buffer *dst;
- v4l2_m2m_buf_done(src, result);
- v4l2_m2m_buf_done(dst, result);
+ dst = v4l2_m2m_next_dst_buf(ctx->fh.m2m_ctx);
+ ret = ctx->buf_finish(ctx, &dst->vb2_buf, bytesused);
+ if (ret)
+ result = VB2_BUF_STATE_ERROR;
+ }
- v4l2_m2m_job_finish(vpu->m2m_dev, ctx->fh.m2m_ctx);
+ v4l2_m2m_buf_done_and_job_finish(ctx->dev->m2m_dev, ctx->fh.m2m_ctx,
+ result);
}
void hantro_irq_done(struct hantro_dev *vpu, unsigned int bytesused,
--
2.25.0
next prev parent reply other threads:[~2020-03-18 13:22 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-18 13:21 [PATCH v2 0/8] hantro: set of small cleanups and fixes Ezequiel Garcia
2020-03-18 13:21 ` [PATCH v2 1/8] v4l2-mem2mem: return CAPTURE buffer first Ezequiel Garcia
2020-03-18 13:21 ` [PATCH v2 2/8] hantro: Set buffers' zeroth plane payload in .buf_prepare Ezequiel Garcia
2020-03-18 13:21 ` Ezequiel Garcia [this message]
2020-03-25 8:22 ` [PATCH v2 3/8] hantro: Use v4l2_m2m_buf_done_and_job_finish Hans Verkuil
2020-03-25 14:02 ` Nicolas Dufresne
2020-03-25 15:28 ` Hans Verkuil
2020-03-25 20:30 ` Ezequiel Garcia
2020-03-26 18:30 ` Nicolas Dufresne
2020-03-18 13:21 ` [PATCH v2 4/8] hantro: Remove unneeded hantro_dec_buf_finish Ezequiel Garcia
2020-03-18 13:21 ` [PATCH v2 5/8] hantro: Move H264 motion vector calculation to a helper Ezequiel Garcia
2020-03-18 13:21 ` [PATCH v2 6/8] hantro: Refactor for V4L2 API spec compliancy Ezequiel Garcia
2020-03-18 13:21 ` [PATCH v2 7/8] dt-bindings: rockchip-vpu: Convert bindings to json-schema Ezequiel Garcia
2020-03-18 13:21 ` [PATCH v2 8/8] hantro: Add linux-rockchip mailing list to MAINTAINERS Ezequiel Garcia
2020-03-19 15:26 ` Heiko Stübner
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=20200318132108.21873-4-ezequiel@collabora.com \
--to=ezequiel@collabora.com \
--cc=acourbot@chromium.org \
--cc=heiko@sntech.de \
--cc=hverkuil@xs4all.nl \
--cc=jkardatzke@chromium.org \
--cc=jonas@kwiboo.se \
--cc=kernel@collabora.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=linux-rockchip@lists.infradead.org \
--cc=nicolas@ndufresne.ca \
--cc=robh@kernel.org \
--cc=tfiga@chromium.org \
/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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).