| From 6473589c24c8d3363746de5bd85f89db890035d7 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Sat, 18 Jun 2022 08:29:29 +0100 |
| Subject: media: mediatek: vcodec: Initialize decoder parameters after getting |
| dec_capability |
| |
| 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 52e5d36aa912..50cfb18f85ae 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 995e6e2fb1ab..95a53385a61c 100644 |
| --- a/drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec_drv.c |
| +++ b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec_drv.c |
| @@ -208,6 +208,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 |
| |
