lkml.org 
[lkml]   [2022]   [Aug]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.18 0378/1095] media: mediatek: vcodec: Initialize decoder parameters after getting dec_capability
    Date
    From: Yunfei Dong <yunfei.dong@mediatek.com>

    [ Upstream commit faddaa735c208560a3f419038e8d154a01b584e3 ]

    Need to get dec_capability from scp first, then initialize decoder
    supported format and other parameters according to dec_capability value.

    Fixes: fd00d90330d1 ("media: mtk-vcodec: vdec: move stateful ops into their own file")
    Signed-off-by: Yunfei Dong <yunfei.dong@mediatek.com>
    Reviewed-by: Chen-Yu Tsai <wenst@chromium.org>
    Tested-by: Chen-Yu Tsai <wenst@chromium.org>
    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>
    ---
    drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec.c | 2 --
    drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec_drv.c | 2 ++
    2 files changed, 2 insertions(+), 2 deletions(-)

    diff --git a/drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec.c b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec.c
    index c8ee5e2b4f69..4bb8a2751271 100644
    --- a/drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec.c
    +++ b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec.c
    @@ -112,8 +112,6 @@ void mtk_vcodec_dec_set_default_params(struct mtk_vcodec_ctx *ctx)
    {
    struct mtk_q_data *q_data;

    - ctx->dev->vdec_pdata->init_vdec_params(ctx);
    -
    ctx->m2m_ctx->q_lock = &ctx->dev->dev_mutex;
    ctx->fh.m2m_ctx = ctx->m2m_ctx;
    ctx->fh.ctrl_handler = &ctx->ctrl_hdl;
    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 fe7b2f1739b1..bd1ee9901da0 100644
    --- a/drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec_drv.c
    +++ b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec_drv.c
    @@ -211,6 +211,8 @@ static int fops_vcodec_open(struct file *file)

    dev->dec_capability =
    mtk_vcodec_fw_get_vdec_capa(dev->fw_handler);
    + ctx->dev->vdec_pdata->init_vdec_params(ctx);
    +
    mtk_v4l2_debug(0, "decoder capability %x", dev->dec_capability);
    }

    --
    2.35.1


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