From nobody Sun Sep 22 06:27:48 2024 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4F7FAC4332F for ; Tue, 26 Apr 2022 10:28:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1348982AbiDZKbb (ORCPT ); Tue, 26 Apr 2022 06:31:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37736 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1348871AbiDZKbM (ORCPT ); Tue, 26 Apr 2022 06:31:12 -0400 Received: from mailgw01.mediatek.com (unknown [60.244.123.138]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BF9581023D7; Tue, 26 Apr 2022 03:08:56 -0700 (PDT) X-UUID: 113844da552444f59c1f754ea6cbf930-20220426 X-CID-P-RULE: Release_Ham X-CID-O-INFO: VERSION:1.1.4,REQID:fc156296-9731-4b9f-8c80-8371b03a8420,OB:0,LO B:0,IP:0,URL:0,TC:0,Content:-20,EDM:0,RT:0,SF:95,FILE:0,RULE:Release_Ham,A CTION:release,TS:75 X-CID-INFO: VERSION:1.1.4,REQID:fc156296-9731-4b9f-8c80-8371b03a8420,OB:0,LOB: 0,IP:0,URL:0,TC:0,Content:-20,EDM:0,RT:0,SF:95,FILE:0,RULE:Spam_GS981B3D,A CTION:quarantine,TS:75 X-CID-META: VersionHash:faefae9,CLOUDID:1e6a87c6-85ee-4ac1-ac05-bd3f1e72e732,C OID:2fe14de8a9b9,Recheck:0,SF:13|15|28|17|19|48,TC:nil,Content:0,EDM:-3,Fi le:nil,QS:0,BEC:nil X-UUID: 113844da552444f59c1f754ea6cbf930-20220426 Received: from mtkmbs10n2.mediatek.inc [(172.21.101.183)] by mailgw01.mediatek.com (envelope-from ) (Generic MTA with TLSv1.2 ECDHE-RSA-AES256-GCM-SHA384 256/256) with ESMTP id 193278352; Tue, 26 Apr 2022 18:08:50 +0800 Received: from mtkexhb02.mediatek.inc (172.21.101.103) by mtkmbs10n1.mediatek.inc (172.21.101.34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.2.792.15; Tue, 26 Apr 2022 18:08:49 +0800 Received: from mtkcas11.mediatek.inc (172.21.101.40) by mtkexhb02.mediatek.inc (172.21.101.103) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Tue, 26 Apr 2022 18:08:47 +0800 Received: from localhost.localdomain (10.17.3.154) by mtkcas11.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Tue, 26 Apr 2022 18:08:45 +0800 From: Yunfei Dong To: Yunfei Dong , Alexandre Courbot , Nicolas Dufresne , "Hans Verkuil" , AngeloGioacchino Del Regno , Benjamin Gaignard , Tiffany Lin , Andrew-CT Chen , Mauro Carvalho Chehab , Rob Herring , Matthias Brugger , Tomasz Figa CC: George Sun , Xiaoyong Lu , Hsin-Yi Wang , Fritz Koenig , Daniel Vetter , dri-devel , Irui Wang , "Steve Cho" , , , , , , Subject: [PATCH v10, 07/17] media: mediatek: vcodec: Refactor supported vdec formats and framesizes Date: Tue, 26 Apr 2022 18:08:18 +0800 Message-ID: <20220426100828.13429-8-yunfei.dong@mediatek.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220426100828.13429-1-yunfei.dong@mediatek.com> References: <20220426100828.13429-1-yunfei.dong@mediatek.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-MTK: N Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Supported output and capture format types for mt8192 are different with mt8183. Redefine parameters to store them. Signed-off-by: Yunfei Dong Reviewed-by: AngeloGioacchino Del Regno --- .../media/platform/mediatek/vcodec/mtk_vcodec_dec.c | 8 ++++---- .../mediatek/vcodec/mtk_vcodec_dec_stateful.c | 13 ++++++++----- .../mediatek/vcodec/mtk_vcodec_dec_stateless.c | 13 +++++++------ .../media/platform/mediatek/vcodec/mtk_vcodec_drv.h | 13 +++++++++++-- 4 files changed, 30 insertions(+), 17 deletions(-) diff --git a/drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec.c b/driv= ers/media/platform/mediatek/vcodec/mtk_vcodec_dec.c index c1c3f439d7d1..1fb49a779c5d 100644 --- a/drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec.c +++ b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec.c @@ -26,7 +26,7 @@ mtk_vdec_find_format(struct v4l2_format *f, const struct mtk_video_fmt *fmt; unsigned int k; =20 - for (k =3D 0; k < dec_pdata->num_formats; k++) { + for (k =3D 0; k < *dec_pdata->num_formats; k++) { fmt =3D &dec_pdata->vdec_formats[k]; if (fmt->fourcc =3D=3D f->fmt.pix_mp.pixelformat) return fmt; @@ -531,7 +531,7 @@ static int vidioc_enum_framesizes(struct file *file, vo= id *priv, if (fsize->index !=3D 0) return -EINVAL; =20 - for (i =3D 0; i < dec_pdata->num_framesizes; ++i) { + for (i =3D 0; i < *dec_pdata->num_framesizes; ++i) { if (fsize->pixel_format !=3D dec_pdata->vdec_framesizes[i].fourcc) continue; =20 @@ -563,7 +563,7 @@ static int vidioc_enum_fmt(struct v4l2_fmtdesc *f, void= *priv, const struct mtk_video_fmt *fmt; int i, j =3D 0; =20 - for (i =3D 0; i < dec_pdata->num_formats; i++) { + for (i =3D 0; i < *dec_pdata->num_formats; i++) { if (output_queue && dec_pdata->vdec_formats[i].type !=3D MTK_FMT_DEC) continue; @@ -576,7 +576,7 @@ static int vidioc_enum_fmt(struct v4l2_fmtdesc *f, void= *priv, ++j; } =20 - if (i =3D=3D dec_pdata->num_formats) + if (i =3D=3D *dec_pdata->num_formats) return -EINVAL; =20 fmt =3D &dec_pdata->vdec_formats[i]; diff --git a/drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec_stateful= .c b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec_stateful.c index e7fd39180123..9c7e6145cebb 100644 --- a/drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec_stateful.c +++ b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec_stateful.c @@ -37,7 +37,9 @@ static const struct mtk_video_fmt mtk_video_formats[] =3D= { }, }; =20 -#define NUM_FORMATS ARRAY_SIZE(mtk_video_formats) +static const unsigned int num_supported_formats =3D + ARRAY_SIZE(mtk_video_formats); + #define DEFAULT_OUT_FMT_IDX 0 #define DEFAULT_CAP_FMT_IDX 3 =20 @@ -59,7 +61,8 @@ static const struct mtk_codec_framesizes mtk_vdec_framesi= zes[] =3D { }, }; =20 -#define NUM_SUPPORTED_FRAMESIZE ARRAY_SIZE(mtk_vdec_framesizes) +static const unsigned int num_supported_framesize =3D + ARRAY_SIZE(mtk_vdec_framesizes); =20 /* * This function tries to clean all display buffers, the buffers will retu= rn @@ -230,7 +233,7 @@ static void mtk_vdec_update_fmt(struct mtk_vcodec_ctx *= ctx, unsigned int k; =20 dst_q_data =3D &ctx->q_data[MTK_Q_DATA_DST]; - for (k =3D 0; k < NUM_FORMATS; k++) { + for (k =3D 0; k < num_supported_formats; k++) { fmt =3D &mtk_video_formats[k]; if (fmt->fourcc =3D=3D pixelformat) { mtk_v4l2_debug(1, "Update cap fourcc(%d -> %d)", @@ -612,11 +615,11 @@ const struct mtk_vcodec_dec_pdata mtk_vdec_8173_pdata= =3D { .ctrls_setup =3D mtk_vcodec_dec_ctrls_setup, .vdec_vb2_ops =3D &mtk_vdec_frame_vb2_ops, .vdec_formats =3D mtk_video_formats, - .num_formats =3D NUM_FORMATS, + .num_formats =3D &num_supported_formats, .default_out_fmt =3D &mtk_video_formats[DEFAULT_OUT_FMT_IDX], .default_cap_fmt =3D &mtk_video_formats[DEFAULT_CAP_FMT_IDX], .vdec_framesizes =3D mtk_vdec_framesizes, - .num_framesizes =3D NUM_SUPPORTED_FRAMESIZE, + .num_framesizes =3D &num_supported_framesize, .worker =3D mtk_vdec_worker, .flush_decoder =3D mtk_vdec_flush_decoder, .is_subdev_supported =3D false, diff --git a/drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec_stateles= s.c b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec_stateless.c index c61df1f51185..0034b2ee9259 100644 --- a/drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec_stateless.c +++ b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec_stateless.c @@ -94,7 +94,8 @@ static const struct mtk_video_fmt mtk_video_formats[] =3D= { }, }; =20 -#define NUM_FORMATS ARRAY_SIZE(mtk_video_formats) +static const unsigned int num_supported_formats =3D ARRAY_SIZE(mtk_video_f= ormats); + #define DEFAULT_OUT_FMT_IDX 0 #define DEFAULT_CAP_FMT_IDX 1 =20 @@ -106,7 +107,7 @@ static const struct mtk_codec_framesizes mtk_vdec_frame= sizes[] =3D { }, }; =20 -#define NUM_SUPPORTED_FRAMESIZE ARRAY_SIZE(mtk_vdec_framesizes) +static const unsigned int num_supported_framesize =3D ARRAY_SIZE(mtk_vdec_= framesizes); =20 static void mtk_vdec_stateless_cap_to_disp(struct mtk_vcodec_ctx *ctx, int= error, struct media_request *src_buf_req) @@ -362,11 +363,11 @@ const struct mtk_vcodec_dec_pdata mtk_vdec_8183_pdata= =3D { .ctrls_setup =3D mtk_vcodec_dec_ctrls_setup, .vdec_vb2_ops =3D &mtk_vdec_request_vb2_ops, .vdec_formats =3D mtk_video_formats, - .num_formats =3D NUM_FORMATS, + .num_formats =3D &num_supported_formats, .default_out_fmt =3D &mtk_video_formats[DEFAULT_OUT_FMT_IDX], .default_cap_fmt =3D &mtk_video_formats[DEFAULT_CAP_FMT_IDX], .vdec_framesizes =3D mtk_vdec_framesizes, - .num_framesizes =3D NUM_SUPPORTED_FRAMESIZE, + .num_framesizes =3D &num_supported_framesize, .uses_stateless_api =3D true, .worker =3D mtk_vdec_worker, .flush_decoder =3D mtk_vdec_flush_decoder, @@ -382,11 +383,11 @@ const struct mtk_vcodec_dec_pdata mtk_lat_sig_core_pd= ata =3D { .ctrls_setup =3D mtk_vcodec_dec_ctrls_setup, .vdec_vb2_ops =3D &mtk_vdec_request_vb2_ops, .vdec_formats =3D mtk_video_formats, - .num_formats =3D NUM_FORMATS, + .num_formats =3D &num_supported_formats, .default_out_fmt =3D &mtk_video_formats[DEFAULT_OUT_FMT_IDX], .default_cap_fmt =3D &mtk_video_formats[DEFAULT_CAP_FMT_IDX], .vdec_framesizes =3D mtk_vdec_framesizes, - .num_framesizes =3D NUM_SUPPORTED_FRAMESIZE, + .num_framesizes =3D &num_supported_framesize, .uses_stateless_api =3D true, .worker =3D mtk_vdec_worker, .flush_decoder =3D mtk_vdec_flush_decoder, diff --git a/drivers/media/platform/mediatek/vcodec/mtk_vcodec_drv.h b/driv= ers/media/platform/mediatek/vcodec/mtk_vcodec_drv.h index c06463142182..d74a9e0e74fe 100644 --- a/drivers/media/platform/mediatek/vcodec/mtk_vcodec_drv.h +++ b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_drv.h @@ -344,6 +344,15 @@ enum mtk_vdec_hw_arch { MTK_VDEC_LAT_SINGLE_CORE, }; =20 +/* + * struct mtk_vdec_format_types - Structure used to get supported + * format types according to decoder capability + */ +enum mtk_vdec_format_types { + MTK_VDEC_FORMAT_MM21 =3D 0x20, + MTK_VDEC_FORMAT_H264_SLICE =3D 0x100, +}; + /** * struct mtk_vcodec_dec_pdata - compatible data for each IC * @init_vdec_params: init vdec params @@ -380,12 +389,12 @@ struct mtk_vcodec_dec_pdata { struct vb2_ops *vdec_vb2_ops; =20 const struct mtk_video_fmt *vdec_formats; - const int num_formats; + const int *num_formats; const struct mtk_video_fmt *default_out_fmt; const struct mtk_video_fmt *default_cap_fmt; =20 const struct mtk_codec_framesizes *vdec_framesizes; - const int num_framesizes; + const int *num_framesizes; =20 enum mtk_vdec_hw_arch hw_arch; =20 --=20 2.18.0