From: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
To: "Yunfei Dong" <yunfei.dong@mediatek.com>,
"Nícolas F . R . A . Prado" <nfraprado@collabora.com>,
"Nicolas Dufresne" <nicolas.dufresne@collabora.com>,
"Hans Verkuil" <hverkuil-cisco@xs4all.nl>,
"Benjamin Gaignard" <benjamin.gaignard@collabora.com>,
"Nathan Hebert" <nhebert@chromium.org>,
"Sebastian Fricke" <sebastian.fricke@collabora.com>
Cc: Hsin-Yi Wang <hsinyi@chromium.org>,
Fritz Koenig <frkoenig@chromium.org>,
Daniel Vetter <daniel@ffwll.ch>,
Steve Cho <stevecho@chromium.org>,
linux-media@vger.kernel.org, devicetree@vger.kernel.org,
linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
linux-mediatek@lists.infradead.org,
Project_Global_Chrome_Upstream_Group@mediatek.com
Subject: Re: [PATCH v2] media: mediatek: vcodec: add decoder command to support stateless decoder
Date: Thu, 9 May 2024 11:54:31 +0200 [thread overview]
Message-ID: <2aefd938-f70a-4133-a3a8-9c96464c9f5f@collabora.com> (raw)
In-Reply-To: <20240316081344.4262-1-yunfei.dong@mediatek.com>
Il 16/03/24 09:13, Yunfei Dong ha scritto:
> The supported decoder commands are different for stateless and
> stateful architecture. Add stateless decoder commands to fix
> the v4l2-compliance test error below.
>
> Codec ioctls:
> VIDIOC_ENCODER_CMD returned -1 (Inappropriate ioctl for device)
> VIDIOC_TRY_ENCODER_CMD returned -1 (Inappropriate ioctl for device)
> test VIDIOC_(TRY_)ENCODER_CMD: OK (Not Supported)
> VIDIOC_G_ENC_INDEX returned -1 (Inappropriate ioctl for device)
> test VIDIOC_G_ENC_INDEX: OK (Not Supported)
> VIDIOC_DECODER_CMD returned -1 (Invalid argument)
> VIDIOC_TRY_DECODER_CMD returned -1 (Invalid argument)
> VIDIOC_TRY_DECODER_CMD returned -1 (Invalid argument)
> fail: v4l2-test-codecs.cpp(126): ret
> test VIDIOC_(TRY_)DECODER_CMD: FAIL
>
> Signed-off-by: Yunfei Dong <yunfei.dong@mediatek.com>
Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Nicolas, Sebastian, anything to add?
Cheers,
Angelo
> ---
> changed with v1:
> - remove the static function prefix.
> - fix some messages not reasonable.
> ---
> .../mediatek/vcodec/decoder/mtk_vcodec_dec.c | 60 +++++++++++++++++--
> 1 file changed, 54 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/media/platform/mediatek/vcodec/decoder/mtk_vcodec_dec.c b/drivers/media/platform/mediatek/vcodec/decoder/mtk_vcodec_dec.c
> index ba742f0e391d..c2b64a528028 100644
> --- a/drivers/media/platform/mediatek/vcodec/decoder/mtk_vcodec_dec.c
> +++ b/drivers/media/platform/mediatek/vcodec/decoder/mtk_vcodec_dec.c
> @@ -80,21 +80,18 @@ static struct mtk_q_data *mtk_vdec_get_q_data(struct mtk_vcodec_dec_ctx *ctx,
> return &ctx->q_data[MTK_Q_DATA_DST];
> }
>
> -static int vidioc_try_decoder_cmd(struct file *file, void *priv,
> - struct v4l2_decoder_cmd *cmd)
> +static int stateful_try_decoder_cmd(struct file *file, void *priv, struct v4l2_decoder_cmd *cmd)
> {
> return v4l2_m2m_ioctl_try_decoder_cmd(file, priv, cmd);
> }
>
> -
> -static int vidioc_decoder_cmd(struct file *file, void *priv,
> - struct v4l2_decoder_cmd *cmd)
> +static int stateful_decoder_cmd(struct file *file, void *priv, struct v4l2_decoder_cmd *cmd)
> {
> struct mtk_vcodec_dec_ctx *ctx = fh_to_dec_ctx(priv);
> struct vb2_queue *src_vq, *dst_vq;
> int ret;
>
> - ret = vidioc_try_decoder_cmd(file, priv, cmd);
> + ret = stateful_try_decoder_cmd(file, priv, cmd);
> if (ret)
> return ret;
>
> @@ -128,6 +125,57 @@ static int vidioc_decoder_cmd(struct file *file, void *priv,
> return 0;
> }
>
> +static int stateless_try_decoder_cmd(struct file *file, void *priv, struct v4l2_decoder_cmd *cmd)
> +{
> + return v4l2_m2m_ioctl_stateless_try_decoder_cmd(file, priv, cmd);
> +}
> +
> +static int stateless_decoder_cmd(struct file *file, void *priv, struct v4l2_decoder_cmd *cmd)
> +{
> + struct mtk_vcodec_dec_ctx *ctx = fh_to_dec_ctx(priv);
> + int ret;
> +
> + ret = v4l2_m2m_ioctl_stateless_try_decoder_cmd(file, priv, cmd);
> + if (ret)
> + return ret;
> +
> + mtk_v4l2_vdec_dbg(3, ctx, "decoder cmd=%u", cmd->cmd);
> + switch (cmd->cmd) {
> + case V4L2_DEC_CMD_FLUSH:
> + /*
> + * If the flag of the output buffer is equals V4L2_BUF_FLAG_M2M_HOLD_CAPTURE_BUF,
> + * this command will prevent dequeueing the capture buffer containing the last
> + * decoded frame. Or do nothing
> + */
> + break;
> + default:
> + mtk_v4l2_vdec_err(ctx, "invalid stateless decoder cmd=%u", cmd->cmd);
> + return -EINVAL;
> + }
> +
> + return 0;
> +}
> +
> +static int vidioc_try_decoder_cmd(struct file *file, void *priv, struct v4l2_decoder_cmd *cmd)
> +{
> + struct mtk_vcodec_dec_ctx *ctx = fh_to_dec_ctx(priv);
> +
> + if (ctx->dev->vdec_pdata->uses_stateless_api)
> + return stateless_try_decoder_cmd(file, priv, cmd);
> +
> + return stateful_try_decoder_cmd(file, priv, cmd);
> +}
> +
> +static int vidioc_decoder_cmd(struct file *file, void *priv, struct v4l2_decoder_cmd *cmd)
> +{
> + struct mtk_vcodec_dec_ctx *ctx = fh_to_dec_ctx(priv);
> +
> + if (ctx->dev->vdec_pdata->uses_stateless_api)
> + return stateless_decoder_cmd(file, priv, cmd);
> +
> + return stateful_decoder_cmd(file, priv, cmd);
> +}
> +
> void mtk_vdec_unlock(struct mtk_vcodec_dec_ctx *ctx)
> {
> mutex_unlock(&ctx->dev->dec_mutex[ctx->hw_id]);
next prev parent reply other threads:[~2024-05-09 9:54 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-16 8:13 [PATCH v2] media: mediatek: vcodec: add decoder command to support stateless decoder Yunfei Dong
2024-05-09 9:54 ` AngeloGioacchino Del Regno [this message]
2024-05-13 10:06 ` Sebastian Fricke
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=2aefd938-f70a-4133-a3a8-9c96464c9f5f@collabora.com \
--to=angelogioacchino.delregno@collabora.com \
--cc=Project_Global_Chrome_Upstream_Group@mediatek.com \
--cc=benjamin.gaignard@collabora.com \
--cc=daniel@ffwll.ch \
--cc=devicetree@vger.kernel.org \
--cc=frkoenig@chromium.org \
--cc=hsinyi@chromium.org \
--cc=hverkuil-cisco@xs4all.nl \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=linux-mediatek@lists.infradead.org \
--cc=nfraprado@collabora.com \
--cc=nhebert@chromium.org \
--cc=nicolas.dufresne@collabora.com \
--cc=sebastian.fricke@collabora.com \
--cc=stevecho@chromium.org \
--cc=yunfei.dong@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: 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 read-only IMAP folder(s) and NNTP newsgroup(s).