lkml.org 
[lkml]   [2022]   [Jun]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.18 459/879] media: mediatek: vcodec: Fix v4l2 compliance decoder cmd test fail
    Date
    From: Yunfei Dong <yunfei.dong@mediatek.com>

    [ Upstream commit 08a83828825cbf3bc2c9f582a4cd4da9f40c77d6 ]

    Will return -EINVAL using standard framework api when test stateless
    decoder with cmd VIDIOC_(TRY)DECODER_CMD. Disable them to adjust v4l2
    compliance test for user driver(GStreamer/Chrome) won't use decoder cmd.

    Fixes: 8cdc3794b2e3 ("media: mtk-vcodec: vdec: support stateless API")
    Signed-off-by: Yunfei Dong <yunfei.dong@mediatek.com>
    Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
    Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    .../media/platform/mediatek/vcodec/mtk_vcodec_dec.c | 13 +------------
    .../platform/mediatek/vcodec/mtk_vcodec_dec_drv.c | 3 +++
    2 files changed, 4 insertions(+), 12 deletions(-)

    diff --git a/drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec.c b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec.c
    index 130ecef2e766..c8ee5e2b4f69 100644
    --- a/drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec.c
    +++ b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec.c
    @@ -47,14 +47,7 @@ static struct mtk_q_data *mtk_vdec_get_q_data(struct mtk_vcodec_ctx *ctx,
    static int vidioc_try_decoder_cmd(struct file *file, void *priv,
    struct v4l2_decoder_cmd *cmd)
    {
    - struct mtk_vcodec_ctx *ctx = fh_to_ctx(priv);
    -
    - /* Use M2M stateless helper if relevant */
    - if (ctx->dev->vdec_pdata->uses_stateless_api)
    - return v4l2_m2m_ioctl_stateless_try_decoder_cmd(file, priv,
    - cmd);
    - else
    - return v4l2_m2m_ioctl_try_decoder_cmd(file, priv, cmd);
    + return v4l2_m2m_ioctl_try_decoder_cmd(file, priv, cmd);
    }


    @@ -69,10 +62,6 @@ static int vidioc_decoder_cmd(struct file *file, void *priv,
    if (ret)
    return ret;

    - /* Use M2M stateless helper if relevant */
    - if (ctx->dev->vdec_pdata->uses_stateless_api)
    - return v4l2_m2m_ioctl_stateless_decoder_cmd(file, priv, cmd);
    -
    mtk_v4l2_debug(1, "decoder cmd=%u", cmd->cmd);
    dst_vq = v4l2_m2m_get_vq(ctx->m2m_ctx,
    V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE);
    diff --git a/drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec_drv.c b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec_drv.c
    index 128edcf541e1..fe7b2f1739b1 100644
    --- a/drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec_drv.c
    +++ b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec_drv.c
    @@ -400,6 +400,9 @@ static int mtk_vcodec_probe(struct platform_device *pdev)
    }

    if (dev->vdec_pdata->uses_stateless_api) {
    + v4l2_disable_ioctl(vfd_dec, VIDIOC_DECODER_CMD);
    + v4l2_disable_ioctl(vfd_dec, VIDIOC_TRY_DECODER_CMD);
    +
    dev->mdev_dec.dev = &pdev->dev;
    strscpy(dev->mdev_dec.model, MTK_VCODEC_DEC_NAME,
    sizeof(dev->mdev_dec.model));
    --
    2.35.1


    \
     
     \ /
      Last update: 2022-06-08 02:20    [W:2.354 / U:0.320 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site