From patchwork Sat Oct 1 03:17:34 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Irui Wang X-Patchwork-Id: 12996350 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 063A3C4332F for ; Sat, 1 Oct 2022 03:20:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id: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=/KeDfDb9krIbpgRAfb6lgWAUw1wXp0KpzUeXqODXnMs=; b=ts9xgJIeQImGkA VPXSD8y2swXWxYX5duKpz7FUpehXq4G7XrMOk7rWukQGy/H0iqXgUaRsTxYh5fF9DlNpuVJ6WJmFn wARbRrMJ2mNdzviYWTriQrCOj00Cr6k7PkCKSO3hImdJeSHG6/WQH16IqXETVjWDrkgfUr9BJ+rpB rRCxROn5QGC1YC2Cje1AIXRx93Sk70IwGoZiO2p30ccY1Oz8NAOVRlFpKXNfXZeIAhfBUCPwjxXN4 CEmgP3hUyNupIC5CmaToIGwXND0QDpeoGjF9N2vDfvn1VlTcqORoco0eE+a81qoO6Z2Zn+r21sZjW gTlMu7wlPjrbBu37Rt6g==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oeT1s-00CqmW-T1; Sat, 01 Oct 2022 03:19:05 +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 1oeT1o-00CqjO-Kp; Sat, 01 Oct 2022 03:19:02 +0000 X-UUID: f9c76508d21b484b9dfb2a9e20e40c19-20220930 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=2cnWDnSWQ4A3CSpnDFyqTwoZZOSmTBmzT9j2HEBromc=; b=poIpXeR6hsImaQOD6ZdBp7tMch65W2sNIkp09LCH/LTOXEWQFeyDFc3NKwSwl7AWYxuakgFg1DAC/sRq9FxGRJzHJMZrozmObAji+yMd9nT0/4j5XHxB8HXD8t+6ERxRchlUl3jyDCaYW9ZuRZAmGz4FBbSy9mjb57iJ686xF/A=; X-CID-P-RULE: Release_Ham X-CID-O-INFO: VERSION:1.1.11,REQID:5a4ee504-9630-4c85-8381-63462b02eb2e,IP:0,U RL:0,TC:0,Content:-25,EDM:0,RT:0,SF:0,FILE:0,BULK:0,RULE:Release_Ham,ACTIO N:release,TS:-25 X-CID-META: VersionHash:39a5ff1,CLOUDID:1442d6e4-87f9-4bb0-97b6-34957dc0fbbe,B ulkID:nil,BulkQuantity:0,Recheck:0,SF:102,TC:nil,Content:0,EDM:-3,IP:nil,U RL:11|1,File:nil,Bulk:nil,QS:nil,BEC:nil,COL:0 X-UUID: f9c76508d21b484b9dfb2a9e20e40c19-20220930 Received: from mtkmbs11n2.mediatek.inc [(172.21.101.187)] by mailgw01.mediatek.com (envelope-from ) (musrelay.mediatek.com ESMTP with TLSv1.2 ECDHE-RSA-AES256-GCM-SHA384 256/256) with ESMTP id 1003340735; Fri, 30 Sep 2022 20:18:50 -0700 Received: from mtkmbs11n1.mediatek.inc (172.21.101.185) by mtkmbs10n1.mediatek.inc (172.21.101.34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.792.15; Sat, 1 Oct 2022 11:17:46 +0800 Received: from localhost.localdomain (10.17.3.154) by mtkmbs11n1.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.2.792.15 via Frontend Transport; Sat, 1 Oct 2022 11:17:45 +0800 From: Irui Wang To: Hans Verkuil , Mauro Carvalho Chehab , Rob Herring , Matthias Brugger , Krzysztof Kozlowski , "Tzung-Bi Shih" , , , Tiffany Lin CC: Yunfei Dong , Maoguang Meng , Longfei Wang , "Irui Wang" , , , , , , Subject: [PATCH v6, 5/8] media: mediatek: vcodec: Add venc power on/off function Date: Sat, 1 Oct 2022 11:17:34 +0800 Message-ID: <20221001031737.18266-6-irui.wang@mediatek.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221001031737.18266-1-irui.wang@mediatek.com> References: <20221001031737.18266-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-20220930_201900_697754_5DB6FC74 X-CRM114-Status: GOOD ( 18.96 ) X-BeenThere: linux-arm-kernel@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-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org when enable multi-core encoding, all available encoder cores' power need to be on/off, add new functions for encoder cores' power management. Signed-off-by: Irui Wang --- .../platform/mediatek/vcodec/mtk_vcodec_enc.c | 31 +++---- .../mediatek/vcodec/mtk_vcodec_enc_pm.c | 83 +++++++++++++++++++ .../mediatek/vcodec/mtk_vcodec_enc_pm.h | 2 + .../platform/mediatek/vcodec/venc_drv_if.c | 6 -- 4 files changed, 97 insertions(+), 25 deletions(-) diff --git a/drivers/media/platform/mediatek/vcodec/mtk_vcodec_enc.c b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_enc.c index d810a78dde51..66e08e88dcc8 100644 --- a/drivers/media/platform/mediatek/vcodec/mtk_vcodec_enc.c +++ b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_enc.c @@ -8,10 +8,10 @@ #include #include #include -#include #include "mtk_vcodec_drv.h" #include "mtk_vcodec_enc.h" +#include "mtk_vcodec_enc_pm.h" #include "mtk_vcodec_intr.h" #include "mtk_vcodec_util.h" #include "venc_drv_if.h" @@ -879,8 +879,7 @@ static int vb2ops_venc_start_streaming(struct vb2_queue *q, unsigned int count) { struct mtk_vcodec_ctx *ctx = vb2_get_drv_priv(q); struct venc_enc_param param; - int ret, pm_ret; - int i; + int ret, i; /* Once state turn into MTK_STATE_ABORT, we need stop_streaming * to clear it @@ -899,18 +898,12 @@ static int vb2ops_venc_start_streaming(struct vb2_queue *q, unsigned int count) return 0; } - ret = pm_runtime_resume_and_get(&ctx->dev->plat_dev->dev); - if (ret < 0) { - mtk_v4l2_err("pm_runtime_resume_and_get fail %d", ret); - goto err_start_stream; - } - mtk_venc_set_param(ctx, ¶m); ret = venc_if_set_param(ctx, VENC_SET_PARAM_ENC, ¶m); if (ret) { mtk_v4l2_err("venc_if_set_param failed=%d", ret); ctx->state = MTK_STATE_ABORT; - goto err_set_param; + goto err_start_stream; } ctx->param_change = MTK_ENCODE_PARAM_NONE; @@ -923,17 +916,19 @@ static int vb2ops_venc_start_streaming(struct vb2_queue *q, unsigned int count) if (ret) { mtk_v4l2_err("venc_if_set_param failed=%d", ret); ctx->state = MTK_STATE_ABORT; - goto err_set_param; + goto err_start_stream; } ctx->state = MTK_STATE_HEADER; } - return 0; + ret = mtk_vcodec_enc_power_on(ctx); + if (ret) { + mtk_v4l2_err("mtk_vcodec_enc_power_on failed=%d", ret); + ctx->state = MTK_STATE_ABORT; + goto err_start_stream; + } -err_set_param: - pm_ret = pm_runtime_put(&ctx->dev->plat_dev->dev); - if (pm_ret < 0) - mtk_v4l2_err("pm_runtime_put fail %d", pm_ret); + return 0; err_start_stream: for (i = 0; i < q->num_buffers; ++i) { @@ -1018,9 +1013,7 @@ static void vb2ops_venc_stop_streaming(struct vb2_queue *q) if (ret) mtk_v4l2_err("venc_if_deinit failed=%d", ret); - ret = pm_runtime_put(&ctx->dev->plat_dev->dev); - if (ret < 0) - mtk_v4l2_err("pm_runtime_put fail %d", ret); + mtk_vcodec_enc_power_off(ctx); ctx->state = MTK_STATE_FREE; } diff --git a/drivers/media/platform/mediatek/vcodec/mtk_vcodec_enc_pm.c b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_enc_pm.c index 75de5031d292..213c3f50e9eb 100644 --- a/drivers/media/platform/mediatek/vcodec/mtk_vcodec_enc_pm.c +++ b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_enc_pm.c @@ -9,6 +9,7 @@ #include #include +#include "mtk_vcodec_enc_hw.h" #include "mtk_vcodec_enc_pm.h" #include "mtk_vcodec_util.h" @@ -56,6 +57,88 @@ int mtk_vcodec_init_enc_clk(struct platform_device *pdev, } EXPORT_SYMBOL_GPL(mtk_vcodec_init_enc_clk); +static int mtk_enc_core_power_on(struct mtk_vcodec_ctx *ctx) +{ + struct mtk_venc_hw_dev *sub_core; + int ret, i; + + /* multi-core encoding need power on all available cores */ + for (i = 0; i < MTK_VENC_HW_MAX; i++) { + sub_core = (struct mtk_venc_hw_dev *)ctx->dev->enc_hw_dev[i]; + if (!sub_core) + continue; + + ret = pm_runtime_resume_and_get(&sub_core->plat_dev->dev); + if (ret) { + mtk_v4l2_err("power on sub_core[%d] fail %d", i, ret); + goto pm_on_fail; + } + } + return ret; + +pm_on_fail: + for (i -= 1; i >= 0; i--) { + sub_core = (struct mtk_venc_hw_dev *)ctx->dev->enc_hw_dev[i]; + pm_runtime_put_sync(&sub_core->plat_dev->dev); + } + return ret; +} + +int mtk_vcodec_enc_power_on(struct mtk_vcodec_ctx *ctx) +{ + struct mtk_vcodec_pm *pm = &ctx->dev->pm; + int ret; + + ret = pm_runtime_resume_and_get(pm->dev); + if (ret) { + mtk_v4l2_err("pm_runtime_resume_and_get fail %d", ret); + return ret; + } + + if (IS_VENC_MULTICORE(ctx->dev->enc_capability)) { + ret = mtk_enc_core_power_on(ctx); + if (ret) { + mtk_v4l2_err("mtk_enc_core_power_on fail %d", ret); + goto core_error; + } + } + return ret; + +core_error: + pm_runtime_put_sync(pm->dev); + return ret; +} + +static void mtk_enc_core_power_off(struct mtk_vcodec_ctx *ctx) +{ + struct mtk_venc_hw_dev *sub_core; + int ret, i; + + /* multi-core encoding need power off all available cores */ + for (i = 0; i < MTK_VENC_HW_MAX; i++) { + sub_core = (struct mtk_venc_hw_dev *)ctx->dev->enc_hw_dev[i]; + if (!sub_core) + continue; + + ret = pm_runtime_put_sync(&sub_core->plat_dev->dev); + if (ret) + mtk_v4l2_err("power off sub_core[%d] fail %d", i, ret); + } +} + +void mtk_vcodec_enc_power_off(struct mtk_vcodec_ctx *ctx) +{ + struct mtk_vcodec_pm *pm = &ctx->dev->pm; + int ret; + + if (IS_VENC_MULTICORE(ctx->dev->enc_capability)) + mtk_enc_core_power_off(ctx); + + ret = pm_runtime_put_sync(pm->dev); + if (ret) + mtk_v4l2_err("pm_runtime_put_sync fail %d", ret); +} + void mtk_vcodec_enc_clock_on(struct mtk_vcodec_pm *pm) { struct mtk_vcodec_clk *enc_clk = &pm->venc_clk; diff --git a/drivers/media/platform/mediatek/vcodec/mtk_vcodec_enc_pm.h b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_enc_pm.h index 361dec5be47f..9065dec4ed4f 100644 --- a/drivers/media/platform/mediatek/vcodec/mtk_vcodec_enc_pm.h +++ b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_enc_pm.h @@ -12,6 +12,8 @@ int mtk_vcodec_init_enc_clk(struct platform_device *pdev, struct mtk_vcodec_pm *pm); +int mtk_vcodec_enc_power_on(struct mtk_vcodec_ctx *ctx); +void mtk_vcodec_enc_power_off(struct mtk_vcodec_ctx *ctx); void mtk_vcodec_enc_clock_on(struct mtk_vcodec_pm *pm); void mtk_vcodec_enc_clock_off(struct mtk_vcodec_pm *pm); diff --git a/drivers/media/platform/mediatek/vcodec/venc_drv_if.c b/drivers/media/platform/mediatek/vcodec/venc_drv_if.c index ce0bce811615..65a27e39ef5b 100644 --- a/drivers/media/platform/mediatek/vcodec/venc_drv_if.c +++ b/drivers/media/platform/mediatek/vcodec/venc_drv_if.c @@ -32,9 +32,7 @@ int venc_if_init(struct mtk_vcodec_ctx *ctx, unsigned int fourcc) } mtk_venc_lock(ctx); - mtk_vcodec_enc_clock_on(&ctx->dev->pm); ret = ctx->enc_if->init(ctx); - mtk_vcodec_enc_clock_off(&ctx->dev->pm); mtk_venc_unlock(ctx); return ret; @@ -46,9 +44,7 @@ int venc_if_set_param(struct mtk_vcodec_ctx *ctx, int ret = 0; mtk_venc_lock(ctx); - mtk_vcodec_enc_clock_on(&ctx->dev->pm); ret = ctx->enc_if->set_param(ctx->drv_handle, type, in); - mtk_vcodec_enc_clock_off(&ctx->dev->pm); mtk_venc_unlock(ctx); return ret; @@ -89,9 +85,7 @@ int venc_if_deinit(struct mtk_vcodec_ctx *ctx) return 0; mtk_venc_lock(ctx); - mtk_vcodec_enc_clock_on(&ctx->dev->pm); ret = ctx->enc_if->deinit(ctx->drv_handle); - mtk_vcodec_enc_clock_off(&ctx->dev->pm); mtk_venc_unlock(ctx); ctx->drv_handle = NULL;