From nobody Sat Oct 4 19:18:48 2025 Received: from mailgw01.mediatek.com (unknown [60.244.123.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BE6C82ED17E; Thu, 14 Aug 2025 08:57:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=60.244.123.138 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755161825; cv=none; b=VZSTw6676nka8vxCVEu2jbqpRzn7MuCag33Ny3X2lkOoU4/0+I7/CEpTXGE1j5dQ9aJg815SMvlyd2PPc9UKzsfo41l/qizDZp6ge5vtzwz2k6PPpRvmVWQsQPGFqce1ojnntwZ7fd25JoQ96jlSVnppw58f6IkZEXPTijGsUCI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755161825; c=relaxed/simple; bh=0JOvwcBqNt6molqZKU7MM2vZJY654yDxvIvIM+BoHxY=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=oAArHGEBXZYcje5qFEBQsHXSeeWA9t/1yCduxoEMmDRb5xKR9WCTtC3zdUnCPJEMaM75tnEpBfHFFIToKL970rRnA2QsgKr/yF0kGue9iMR2b5wQRX3c3Byr1lDAASWmo43gY5/XAbhUfAdNUu+DbJd0PBK2hEOSCdmOn6ve7Ro= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=mediatek.com; spf=pass smtp.mailfrom=mediatek.com; dkim=pass (1024-bit key) header.d=mediatek.com header.i=@mediatek.com header.b=epwX89QI; arc=none smtp.client-ip=60.244.123.138 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=mediatek.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=mediatek.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=mediatek.com header.i=@mediatek.com header.b="epwX89QI" X-UUID: a065b45278ec11f08729452bf625a8b4-20250814 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=Content-Type:Content-Transfer-Encoding:MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:CC:To:From; bh=gOkUr/gDQdk50ByUmng27+uyHqsJTeLrhuWy7Mo/xxs=; b=epwX89QI5pR1C2LXkiNvItiHNQlb/7isdClSyOXRHxCIlq4TBfYSrPmrzT269qCVJ+aKecaaxKQP/6ZMMtVJu++mcvr+CT6Ik79w5UYO4T+GiBrWhHjQTDyASRrwp/MubVZGdvtTePd2SkjfXRet65dnBmjyq18xmsldDonyfRE=; X-CID-P-RULE: Release_Ham X-CID-O-INFO: VERSION:1.3.3,REQID:de967c0d-9c7f-4fe4-9ffd-1e3c2b2c052e,IP:0,UR L:0,TC:0,Content:-25,EDM:0,RT:0,SF:0,FILE:0,BULK:0,RULE:Release_Ham,ACTION :release,TS:-25 X-CID-META: VersionHash:f1326cf,CLOUDID:c7ed217a-966c-41bd-96b5-7d0b3c22e782,B ulkID:nil,BulkQuantity:0,Recheck:0,SF:81|82|102,TC:-5,Content:0|15|50,EDM: -3,IP:nil,URL:0,File:nil,RT:nil,Bulk:nil,QS:nil,BEC:nil,COL:0,OSI:0,OSA:0, AV:0,LES:1,SPR:NO,DKR:0,DKP:0,BRR:0,BRE:0,ARC:0 X-CID-BVR: 2,SSN|SDN X-CID-BAS: 2,SSN|SDN,0,_ X-CID-FACTOR: TF_CID_SPAM_SNR X-CID-RHF: D41D8CD98F00B204E9800998ECF8427E X-UUID: a065b45278ec11f08729452bf625a8b4-20250814 Received: from mtkmbs09n1.mediatek.inc [(172.21.101.35)] by mailgw01.mediatek.com (envelope-from ) (Generic MTA with TLSv1.2 ECDHE-RSA-AES256-GCM-SHA384 256/256) with ESMTP id 1179593072; Thu, 14 Aug 2025 16:56:54 +0800 Received: from mtkmbs13n2.mediatek.inc (172.21.101.108) by mtkmbs10n2.mediatek.inc (172.21.101.183) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1258.39; Thu, 14 Aug 2025 16:56:53 +0800 Received: from mhfsdcap04.gcn.mediatek.inc (10.17.3.154) by mtkmbs13n2.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.2.1258.39 via Frontend Transport; Thu, 14 Aug 2025 16:56:52 +0800 From: Kyrie Wu To: Tiffany Lin , Andrew-CT Chen , Yunfei Dong , "Mauro Carvalho Chehab" , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Matthias Brugger , AngeloGioacchino Del Regno , Kyrie Wu , Hans Verkuil , Nicolas Dufresne , Christophe JAILLET , Sebastian Fricke , Nathan Hebert , "Arnd Bergmann" , Irui Wang , George Sun , , , , , CC: Neil Armstrong , Andrzej Pietrasiewicz Subject: [PATCH v3 4/6] media: mediatek: encoder: Add a new platform data member Date: Thu, 14 Aug 2025 16:56:40 +0800 Message-ID: <20250814085642.17343-5-kyrie.wu@mediatek.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20250814085642.17343-1-kyrie.wu@mediatek.com> References: <20250814085642.17343-1-kyrie.wu@mediatek.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-MTK: N Content-Type: text/plain; charset="utf-8" From: Irui Wang Add a new platform data member to indicate each encoder IC, so that the get chip name function by 'of_device_is_compatible' can be removed. Signed-off-by: Irui Wang --- .../mediatek/vcodec/encoder/mtk_vcodec_enc.c | 23 ++----------------- .../vcodec/encoder/mtk_vcodec_enc_drv.c | 6 +++++ .../vcodec/encoder/mtk_vcodec_enc_drv.h | 2 ++ 3 files changed, 10 insertions(+), 21 deletions(-) diff --git a/drivers/media/platform/mediatek/vcodec/encoder/mtk_vcodec_enc.= c b/drivers/media/platform/mediatek/vcodec/encoder/mtk_vcodec_enc.c index 03512bf7a072..1a7be3e57eef 100644 --- a/drivers/media/platform/mediatek/vcodec/encoder/mtk_vcodec_enc.c +++ b/drivers/media/platform/mediatek/vcodec/encoder/mtk_vcodec_enc.c @@ -198,34 +198,15 @@ static int vidioc_enum_fmt_vid_out(struct file *file,= void *priv, pdata->num_output_formats); } =20 -static int mtk_vcodec_enc_get_chip_name(void *priv) -{ - struct mtk_vcodec_enc_ctx *ctx =3D fh_to_enc_ctx(priv); - struct device *dev =3D &ctx->dev->plat_dev->dev; - - if (of_device_is_compatible(dev->of_node, "mediatek,mt8173-vcodec-enc")) - return 8173; - else if (of_device_is_compatible(dev->of_node, "mediatek,mt8183-vcodec-en= c")) - return 8183; - else if (of_device_is_compatible(dev->of_node, "mediatek,mt8192-vcodec-en= c")) - return 8192; - else if (of_device_is_compatible(dev->of_node, "mediatek,mt8195-vcodec-en= c")) - return 8195; - else if (of_device_is_compatible(dev->of_node, "mediatek,mt8188-vcodec-en= c")) - return 8188; - else - return 8173; -} - static int vidioc_venc_querycap(struct file *file, void *priv, struct v4l2_capability *cap) { struct mtk_vcodec_enc_ctx *ctx =3D fh_to_enc_ctx(priv); + const struct mtk_vcodec_enc_pdata *pdata =3D ctx->dev->venc_pdata; struct device *dev =3D &ctx->dev->plat_dev->dev; - int platform_name =3D mtk_vcodec_enc_get_chip_name(priv); =20 strscpy(cap->driver, dev->driver->name, sizeof(cap->driver)); - snprintf(cap->card, sizeof(cap->card), "MT%d video encoder", platform_nam= e); + snprintf(cap->card, sizeof(cap->card), "MT%d video encoder", pdata->venc_= model_num); =20 return 0; } diff --git a/drivers/media/platform/mediatek/vcodec/encoder/mtk_vcodec_enc_= drv.c b/drivers/media/platform/mediatek/vcodec/encoder/mtk_vcodec_enc_drv.c index bb913dfe5f04..50936949d527 100644 --- a/drivers/media/platform/mediatek/vcodec/encoder/mtk_vcodec_enc_drv.c +++ b/drivers/media/platform/mediatek/vcodec/encoder/mtk_vcodec_enc_drv.c @@ -380,6 +380,7 @@ static int mtk_vcodec_probe(struct platform_device *pde= v) } =20 static const struct mtk_vcodec_enc_pdata mt8173_avc_pdata =3D { + .venc_model_num =3D 8173, .capture_formats =3D mtk_video_formats_capture_h264, .num_capture_formats =3D ARRAY_SIZE(mtk_video_formats_capture_h264), .output_formats =3D mtk_video_formats_output, @@ -390,6 +391,7 @@ static const struct mtk_vcodec_enc_pdata mt8173_avc_pda= ta =3D { }; =20 static const struct mtk_vcodec_enc_pdata mt8173_vp8_pdata =3D { + .venc_model_num =3D 8173, .capture_formats =3D mtk_video_formats_capture_vp8, .num_capture_formats =3D ARRAY_SIZE(mtk_video_formats_capture_vp8), .output_formats =3D mtk_video_formats_output, @@ -400,6 +402,7 @@ static const struct mtk_vcodec_enc_pdata mt8173_vp8_pda= ta =3D { }; =20 static const struct mtk_vcodec_enc_pdata mt8183_pdata =3D { + .venc_model_num =3D 8183, .uses_ext =3D true, .capture_formats =3D mtk_video_formats_capture_h264, .num_capture_formats =3D ARRAY_SIZE(mtk_video_formats_capture_h264), @@ -411,6 +414,7 @@ static const struct mtk_vcodec_enc_pdata mt8183_pdata = =3D { }; =20 static const struct mtk_vcodec_enc_pdata mt8188_pdata =3D { + .venc_model_num =3D 8188, .uses_ext =3D true, .capture_formats =3D mtk_video_formats_capture_h264, .num_capture_formats =3D ARRAY_SIZE(mtk_video_formats_capture_h264), @@ -423,6 +427,7 @@ static const struct mtk_vcodec_enc_pdata mt8188_pdata = =3D { }; =20 static const struct mtk_vcodec_enc_pdata mt8192_pdata =3D { + .venc_model_num =3D 8192, .uses_ext =3D true, .capture_formats =3D mtk_video_formats_capture_h264, .num_capture_formats =3D ARRAY_SIZE(mtk_video_formats_capture_h264), @@ -434,6 +439,7 @@ static const struct mtk_vcodec_enc_pdata mt8192_pdata = =3D { }; =20 static const struct mtk_vcodec_enc_pdata mt8195_pdata =3D { + .venc_model_num =3D 8195, .uses_ext =3D true, .capture_formats =3D mtk_video_formats_capture_h264, .num_capture_formats =3D ARRAY_SIZE(mtk_video_formats_capture_h264), diff --git a/drivers/media/platform/mediatek/vcodec/encoder/mtk_vcodec_enc_= drv.h b/drivers/media/platform/mediatek/vcodec/encoder/mtk_vcodec_enc_drv.h index 426b1398f815..b3206a7b592d 100644 --- a/drivers/media/platform/mediatek/vcodec/encoder/mtk_vcodec_enc_drv.h +++ b/drivers/media/platform/mediatek/vcodec/encoder/mtk_vcodec_enc_drv.h @@ -21,6 +21,7 @@ /** * struct mtk_vcodec_enc_pdata - compatible data for each IC * + * @venc_model_num: encoder model number * @uses_ext: whether the encoder uses the extended firmware messaging for= mat * @min_bitrate: minimum supported encoding bitrate * @max_bitrate: maximum supported encoding bitrate @@ -33,6 +34,7 @@ * @uses_common_fw_iface: whether the encoder uses common driver interface */ struct mtk_vcodec_enc_pdata { + u16 venc_model_num; bool uses_ext; u64 min_bitrate; u64 max_bitrate; --=20 2.46.0