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>,
Mark Rutland <mark.rutland@arm.com>,
devicetree@vger.kernel.org,
Ezequiel Garcia <ezequiel@collabora.com>
Subject: [PATCH v3 3/7] hantro: Use v4l2_m2m_buf_done_and_job_finish
Date: Wed, 25 Mar 2020 18:34:34 -0300 [thread overview]
Message-ID: <20200325213439.16509-4-ezequiel@collabora.com> (raw)
In-Reply-To: <20200325213439.16509-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.
Signed-off-by: Ezequiel Garcia <ezequiel@collabora.com>
--
drivers/staging/media/hantro/hantro_drv.c | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/drivers/staging/media/hantro/hantro_drv.c b/drivers/staging/media/hantro/hantro_drv.c
index ace13973e2d0..d0097c5fe7d9 100644
--- a/drivers/staging/media/hantro/hantro_drv.c
+++ b/drivers/staging/media/hantro/hantro_drv.c
@@ -101,8 +101,8 @@ static void hantro_job_finish(struct hantro_dev *vpu,
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);
+ src = v4l2_m2m_next_src_buf(ctx->fh.m2m_ctx);
+ dst = v4l2_m2m_next_dst_buf(ctx->fh.m2m_ctx);
if (WARN_ON(!src))
return;
@@ -112,14 +112,14 @@ static void hantro_job_finish(struct hantro_dev *vpu,
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;
-
- v4l2_m2m_buf_done(src, result);
- v4l2_m2m_buf_done(dst, result);
+ if (ctx->buf_finish) {
+ 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.26.0.rc2
next prev parent reply other threads:[~2020-03-25 21:35 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-25 21:34 [PATCH v3 0/7] hantro: set of small cleanups and fixes Ezequiel Garcia
2020-03-25 21:34 ` [PATCH v3 1/7] v4l2-mem2mem: return CAPTURE buffer first Ezequiel Garcia
2020-03-25 21:34 ` [PATCH v3 2/7] hantro: Set buffers' zeroth plane payload in .buf_prepare Ezequiel Garcia
2020-03-25 21:34 ` Ezequiel Garcia [this message]
2020-03-25 21:34 ` [PATCH v3 4/7] hantro: Remove unneeded hantro_dec_buf_finish Ezequiel Garcia
2020-03-25 21:34 ` [PATCH v3 5/7] hantro: Move H264 motion vector calculation to a helper Ezequiel Garcia
2020-03-25 21:34 ` [PATCH v3 6/7] hantro: Refactor for V4L2 API spec compliancy Ezequiel Garcia
2020-03-25 21:34 ` [PATCH v3 7/7] dt-bindings: rockchip-vpu: Convert bindings to json-schema Ezequiel Garcia
2020-03-26 16:55 ` Rob Herring
2020-03-26 19:08 ` Ezequiel Garcia
2020-03-26 16:59 ` Rob Herring
2020-03-26 19:09 ` Ezequiel Garcia
2020-03-26 19:13 ` [PATCH v4] " Ezequiel Garcia
2020-03-27 3:05 ` Rob Herring
2020-04-20 13:33 ` Johan Jonker
2020-04-21 2:59 ` Ezequiel Garcia
2020-04-21 13:19 ` Johan Jonker
2020-04-21 13:36 ` Johan Jonker
2020-04-21 13:44 ` Hans Verkuil
2020-04-21 13:52 ` Ezequiel Garcia
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=20200325213439.16509-4-ezequiel@collabora.com \
--to=ezequiel@collabora.com \
--cc=acourbot@chromium.org \
--cc=devicetree@vger.kernel.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=mark.rutland@arm.com \
--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).