From patchwork Fri Jun 24 08:23:29 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Irui Wang X-Patchwork-Id: 12894167 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 8F71CC43334 for ; Fri, 24 Jun 2022 08:31:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Type: Content-Transfer-Encoding:MIME-Version:References:In-Reply-To:Message-ID:Date :Subject:CC:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=MMX8Sy6u787mW01pfie7Ikq959c0WZVbQnE4QjgRXd8=; b=zrpNtBhyQYdQ3RWNS7XuZNjH7p Vbd3fy7f4Qr3aQ0bbeKXKSOQxk65ydSKWz2InFsLXBxasQfqi+M/VGR4JgR9QrOqYeA8L9fcSzoof 7H0UgOwD0TSI9dgUt1AizNLaRnPrvyRLYD52dDFOSSj2dBeb39xIMxMFLZup56fyHIcFkRt9pcMxo Qo+sNC8hOSxA67s/GKQnJXsAw1KFQN3/N3eQKu0HPtzuxuLqN1Zz9ieM0Iv5jvVyuZo0kMcMYweMK 3R4ngiuYZg7rTG1TbvXnh4GIO9UtHc9PyxkLXUWgcuX42r6KJWpC5cTLW5VJHoVhrdOLc/5I7JuqG 2PPNYhSw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1o4eiV-001BLo-DD; Fri, 24 Jun 2022 08:31:03 +0000 Received: from mailgw01.mediatek.com ([216.200.240.184]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1o4ehv-001B5t-J8; Fri, 24 Jun 2022 08:30:29 +0000 X-UUID: 8cc44f8f8c384074933f3dcb9e183afa-20220624 X-CID-P-RULE: Release_Ham X-CID-O-INFO: VERSION:1.1.6,REQID:763606b5-1d68-4007-a433-d0b2b38c73e4,OB:0,LO B:0,IP:0,URL:5,TC:0,Content:-5,EDM:0,RT:0,SF:0,FILE:0,RULE:Release_Ham,ACT ION:release,TS:0 X-CID-META: VersionHash:b14ad71,CLOUDID:c17178d8-850a-491d-a127-60d9309b2b3e,C OID:IGNORED,Recheck:0,SF:nil,TC:nil,Content:0,EDM:-3,IP:nil,URL:1,File:nil ,QS:nil,BEC:nil,COL:0 X-UUID: 8cc44f8f8c384074933f3dcb9e183afa-20220624 Received: from mtkcas67.mediatek.inc [(172.29.193.45)] by mailgw01.mediatek.com (envelope-from ) (musrelay.mediatek.com ESMTP with TLSv1.2 ECDHE-RSA-AES256-SHA384 256/256) with ESMTP id 226540420; Fri, 24 Jun 2022 01:30:09 -0700 Received: from mtkmbs11n2.mediatek.inc (172.21.101.187) by MTKMBS62N1.mediatek.inc (172.29.193.41) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Fri, 24 Jun 2022 01:23:42 -0700 Received: from mtkcas10.mediatek.inc (172.21.101.39) by mtkmbs11n2.mediatek.inc (172.21.101.187) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.2.792.3; Fri, 24 Jun 2022 16:23:40 +0800 Received: from localhost.localdomain (10.17.3.154) by mtkcas10.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Fri, 24 Jun 2022 16:23:38 +0800 From: Irui Wang To: Hans Verkuil , Mauro Carvalho Chehab , Rob Herring , Matthias Brugger , Tomasz Figa , Tzung-Bi Shih , Alexandre Courbot , "Tiffany Lin" , Andrew-CT Chen , , CC: Hsin-Yi Wang , Maoguang Meng , Longfei Wang , Yunfei Dong , Irui Wang , , , , , , , Subject: [PATCH v4, 2/8] media: mediatek: vcodec: Enable venc dual core usage Date: Fri, 24 Jun 2022 16:23:29 +0800 Message-ID: <20220624082335.10165-3-irui.wang@mediatek.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220624082335.10165-1-irui.wang@mediatek.com> References: <20220624082335.10165-1-irui.wang@mediatek.com> MIME-Version: 1.0 X-MTK: N X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220624_013027_646291_8423D598 X-CRM114-Status: GOOD ( 29.97 ) X-BeenThere: linux-mediatek@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Linux-mediatek" Errors-To: linux-mediatek-bounces+linux-mediatek=archiver.kernel.org@lists.infradead.org Adds new property to indicate whether the encoder has multiple cores. Use of_platform_populate to probe each venc cores, the core device can use the init_clk/request_irq helper to initialize their own power/clk/irq. Signed-off-by: Irui Wang --- .../media/platform/mediatek/vcodec/Makefile | 4 +- .../platform/mediatek/vcodec/mtk_vcodec_drv.h | 12 ++ .../mediatek/vcodec/mtk_vcodec_enc_drv.c | 10 ++ .../mediatek/vcodec/mtk_vcodec_enc_hw.c | 139 ++++++++++++++++++ .../mediatek/vcodec/mtk_vcodec_enc_hw.h | 36 +++++ 5 files changed, 200 insertions(+), 1 deletion(-) create mode 100644 drivers/media/platform/mediatek/vcodec/mtk_vcodec_enc_hw.c create mode 100644 drivers/media/platform/mediatek/vcodec/mtk_vcodec_enc_hw.h diff --git a/drivers/media/platform/mediatek/vcodec/Makefile b/drivers/media/platform/mediatek/vcodec/Makefile index 93e7a343b5b0..ac068d88af29 100644 --- a/drivers/media/platform/mediatek/vcodec/Makefile +++ b/drivers/media/platform/mediatek/vcodec/Makefile @@ -3,7 +3,8 @@ obj-$(CONFIG_VIDEO_MEDIATEK_VCODEC) += mtk-vcodec-dec.o \ mtk-vcodec-enc.o \ mtk-vcodec-common.o \ - mtk-vcodec-dec-hw.o + mtk-vcodec-dec-hw.o \ + mtk_vcodec_enc_hw.o mtk-vcodec-dec-y := vdec/vdec_h264_if.o \ vdec/vdec_vp8_if.o \ @@ -32,6 +33,7 @@ mtk-vcodec-enc-y := venc/venc_vp8_if.o \ venc_drv_if.o \ venc_vpu_if.o \ +mtk-vcodec-enc-hw-y := mtk_vcodec_enc_hw.o mtk-vcodec-common-y := mtk_vcodec_intr.o \ mtk_vcodec_util.o \ diff --git a/drivers/media/platform/mediatek/vcodec/mtk_vcodec_drv.h b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_drv.h index dc6aada882d9..8919bdf2eef5 100644 --- a/drivers/media/platform/mediatek/vcodec/mtk_vcodec_drv.h +++ b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_drv.h @@ -97,6 +97,15 @@ enum mtk_fmt_type { MTK_FMT_FRAME = 2, }; +/* + * enum mtk_venc_hw_id -- encoder hardware id + */ +enum mtk_venc_hw_id { + MTK_VENC_CORE_0 = 0, + MTK_VENC_CORE_1, + MTK_VENC_HW_MAX, +}; + /* * enum mtk_vdec_hw_id - Hardware index used to separate * different hardware @@ -484,6 +493,7 @@ struct mtk_vcodec_enc_pdata { * @dec_active_cnt: used to mark whether need to record register value * @vdec_racing_info: record register value * @dec_racing_info_mutex: mutex lock used for inner racing mode + * @enc_hw_dev: used to store venc core device */ struct mtk_vcodec_dev { struct v4l2_device v4l2_dev; @@ -534,6 +544,8 @@ struct mtk_vcodec_dev { u32 vdec_racing_info[132]; /* Protects access to vdec_racing_info data */ struct mutex dec_racing_info_mutex; + + void *enc_hw_dev[MTK_VENC_HW_MAX]; }; static inline struct mtk_vcodec_ctx *fh_to_ctx(struct v4l2_fh *fh) diff --git a/drivers/media/platform/mediatek/vcodec/mtk_vcodec_enc_drv.c b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_enc_drv.c index 95e8c29ccc65..65a8251a5a68 100644 --- a/drivers/media/platform/mediatek/vcodec/mtk_vcodec_enc_drv.c +++ b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_enc_drv.c @@ -263,6 +263,16 @@ static int mtk_vcodec_probe(struct platform_device *pdev) goto err_enc_pm; } + if (of_property_read_bool(pdev->dev.of_node, + "mediatek,venc-multi-core")) { + ret = of_platform_populate(pdev->dev.of_node, + NULL, NULL, &pdev->dev); + if (ret) { + mtk_v4l2_err("Venc core device populate failed"); + goto err_enc_pm; + } + } + pm_runtime_enable(&pdev->dev); dev->reg_base[dev->venc_pdata->core_id] = diff --git a/drivers/media/platform/mediatek/vcodec/mtk_vcodec_enc_hw.c b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_enc_hw.c new file mode 100644 index 000000000000..02582cce4863 --- /dev/null +++ b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_enc_hw.c @@ -0,0 +1,139 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Copyright (c) 2021 MediaTek Inc. + */ + +#include +#include +#include +#include +#include +#include + +#include "mtk_vcodec_drv.h" +#include "mtk_vcodec_enc.h" +#include "mtk_vcodec_enc_hw.h" +#include "mtk_vcodec_intr.h" + +static const struct of_device_id mtk_venc_hw_ids[] = { + { + .compatible = "mediatek,mtk-venc-hw", + }, + {}, +}; +MODULE_DEVICE_TABLE(of, mtk_venc_hw_ids); + +static void clean_hw_irq_status(unsigned int irq_status, void __iomem *addr) +{ + if (irq_status & MTK_VENC_IRQ_STATUS_PAUSE) + writel(MTK_VENC_IRQ_STATUS_PAUSE, addr); + + if (irq_status & MTK_VENC_IRQ_STATUS_SWITCH) + writel(MTK_VENC_IRQ_STATUS_SWITCH, addr); + + if (irq_status & MTK_VENC_IRQ_STATUS_DRAM) + writel(MTK_VENC_IRQ_STATUS_DRAM, addr); + + if (irq_status & MTK_VENC_IRQ_STATUS_SPS) + writel(MTK_VENC_IRQ_STATUS_SPS, addr); + + if (irq_status & MTK_VENC_IRQ_STATUS_PPS) + writel(MTK_VENC_IRQ_STATUS_PPS, addr); + + if (irq_status & MTK_VENC_IRQ_STATUS_FRM) + writel(MTK_VENC_IRQ_STATUS_FRM, addr); +} + +static irqreturn_t mtk_enc_hw_irq_handler(int irq, void *priv) +{ + struct mtk_venc_hw_dev *dev = priv; + struct mtk_vcodec_ctx *ctx; + unsigned long flags; + void __iomem *addr; + + spin_lock_irqsave(&dev->main_dev->irqlock, flags); + ctx = dev->curr_ctx; + spin_unlock_irqrestore(&dev->main_dev->irqlock, flags); + if (!ctx) + return IRQ_HANDLED; + + mtk_v4l2_debug(1, "id=%d core :%d", ctx->id, dev->hw_id); + + addr = dev->reg_base + MTK_VENC_IRQ_ACK_OFFSET; + ctx->irq_status = readl(dev->reg_base + MTK_VENC_IRQ_STATUS_OFFSET); + clean_hw_irq_status(ctx->irq_status, addr); + + wake_up_ctx(ctx, MTK_INST_IRQ_RECEIVED, 0); + return IRQ_HANDLED; +} + +static int mtk_venc_hw_probe(struct platform_device *pdev) +{ + struct device *dev = &pdev->dev; + struct mtk_venc_hw_dev *sub_core; + struct mtk_vcodec_dev *main_dev; + int ret; + + if (!dev->parent) + return dev_err_probe(dev, -ENODEV, + "No parent for venc core device\n"); + + main_dev = dev_get_drvdata(dev->parent); + if (!main_dev) + return dev_err_probe(dev, -EINVAL, + "Failed to get parent driver data\n"); + + sub_core = devm_kzalloc(&pdev->dev, sizeof(*sub_core), GFP_KERNEL); + if (!sub_core) + return dev_err_probe(dev, -ENOMEM, + "Failed to get alloc core data\n"); + + sub_core->plat_dev = pdev; + + platform_set_drvdata(pdev, sub_core); + + sub_core->reg_base = devm_platform_ioremap_resource(pdev, 0); + if (IS_ERR(sub_core->reg_base)) + return dev_err_probe(dev, PTR_ERR(sub_core->reg_base), + "Failed to get reg base\n"); + + sub_core->enc_irq = platform_get_irq(pdev, 0); + if (sub_core->enc_irq < 0) + return dev_err_probe(dev, -EINVAL, + "Failed to get irq resource\n"); + + ret = devm_request_irq(dev, sub_core->enc_irq, + mtk_enc_hw_irq_handler, 0, + pdev->name, sub_core); + if (ret) + return dev_err_probe(dev, -EINVAL, + "Failed to install sub_core->enc_irq %d\n", + sub_core->enc_irq); + + of_property_read_u32(dev->of_node, "mediatek,hw-id", + &sub_core->hw_id); + + if (sub_core->hw_id < 0 || sub_core->hw_id >= MTK_VENC_HW_MAX) + return dev_err_probe(dev, -EINVAL, + "Invalid hardware id %d\n", + sub_core->hw_id); + + main_dev->enc_hw_dev[sub_core->hw_id] = sub_core; + sub_core->main_dev = main_dev; + + dev_dbg(dev, "Venc core :%d probe done\n", sub_core->hw_id); + + return 0; +} + +static struct platform_driver mtk_venc_core_driver = { + .probe = mtk_venc_hw_probe, + .driver = { + .name = "mtk-venc-core", + .of_match_table = mtk_venc_hw_ids, + }, +}; +module_platform_driver(mtk_venc_core_driver); + +MODULE_LICENSE("GPL"); +MODULE_DESCRIPTION("MediaTek video encoder core driver"); diff --git a/drivers/media/platform/mediatek/vcodec/mtk_vcodec_enc_hw.h b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_enc_hw.h new file mode 100644 index 000000000000..0ff544c20eb9 --- /dev/null +++ b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_enc_hw.h @@ -0,0 +1,36 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* + * Copyright (c) 2021 MediaTek Inc. + */ + +#ifndef _MTK_VCODEC_ENC_HW_H_ +#define _MTK_VCODEC_ENC_HW_H_ + +#include +#include "mtk_vcodec_drv.h" + +/** + * struct mtk_venc_hw_dev - driver data + * @plat_dev: platform_device + * @main_dev: main device + * @pm: power management data + * @curr_ctx: the context that is waiting for venc hardware + * @reg_base: mapped address of venc registers + * @irq_status: venc hardware irq status + * @enc_irq: venc device irq + * @hw_id: for venc hardware id: core#0, core#1... + */ +struct mtk_venc_hw_dev { + struct platform_device *plat_dev; + struct mtk_vcodec_dev *main_dev; + + struct mtk_vcodec_pm pm; + struct mtk_vcodec_ctx *curr_ctx; + + void __iomem *reg_base; + unsigned int irq_status; + int enc_irq; + int hw_id; +}; + +#endif /* _MTK_VCODEC_ENC_HW_H_ */