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 2/8] hantro: Set buffers' zeroth plane payload in .buf_prepare
Date: Wed, 18 Mar 2020 10:21:02 -0300 [thread overview]
Message-ID: <20200318132108.21873-3-ezequiel@collabora.com> (raw)
In-Reply-To: <20200318132108.21873-1-ezequiel@collabora.com>
Buffers' zeroth plane payload size is calculated at format
negotiation time, and so it can be set in .buf_prepare.
Keep in mind that, to make this change easier, hantro_buf_prepare
is refactored, using the cedrus driver as reference. This results
in cleaner code as byproduct.
Signed-off-by: Ezequiel Garcia <ezequiel@collabora.com>
---
drivers/staging/media/hantro/hantro_v4l2.c | 16 +++++++++++-----
1 file changed, 11 insertions(+), 5 deletions(-)
diff --git a/drivers/staging/media/hantro/hantro_v4l2.c b/drivers/staging/media/hantro/hantro_v4l2.c
index f4ae2cee0f18..3142ab6697d5 100644
--- a/drivers/staging/media/hantro/hantro_v4l2.c
+++ b/drivers/staging/media/hantro/hantro_v4l2.c
@@ -608,7 +608,7 @@ hantro_queue_setup(struct vb2_queue *vq, unsigned int *num_buffers,
}
static int
-hantro_buf_plane_check(struct vb2_buffer *vb, const struct hantro_fmt *vpu_fmt,
+hantro_buf_plane_check(struct vb2_buffer *vb,
struct v4l2_pix_format_mplane *pixfmt)
{
unsigned int sz;
@@ -630,12 +630,18 @@ static int hantro_buf_prepare(struct vb2_buffer *vb)
{
struct vb2_queue *vq = vb->vb2_queue;
struct hantro_ctx *ctx = vb2_get_drv_priv(vq);
+ struct v4l2_pix_format_mplane *pix_fmt;
+ int ret;
if (V4L2_TYPE_IS_OUTPUT(vq->type))
- return hantro_buf_plane_check(vb, ctx->vpu_src_fmt,
- &ctx->src_fmt);
-
- return hantro_buf_plane_check(vb, ctx->vpu_dst_fmt, &ctx->dst_fmt);
+ pix_fmt = &ctx->src_fmt;
+ else
+ pix_fmt = &ctx->dst_fmt;
+ ret = hantro_buf_plane_check(vb, pix_fmt);
+ if (ret)
+ return ret;
+ vb2_set_plane_payload(vb, 0, pix_fmt->plane_fmt[0].sizeimage);
+ return 0;
}
static void hantro_buf_queue(struct vb2_buffer *vb)
--
2.25.0
next prev parent reply other threads:[~2020-03-18 13:21 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 ` Ezequiel Garcia [this message]
2020-03-18 13:21 ` [PATCH v2 3/8] hantro: Use v4l2_m2m_buf_done_and_job_finish Ezequiel Garcia
2020-03-25 8:22 ` 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-3-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).