From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.7 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY,URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C4529C432BE for ; Wed, 1 Sep 2021 08:32:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id AF57560FED for ; Wed, 1 Sep 2021 08:32:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243386AbhIAIdv (ORCPT ); Wed, 1 Sep 2021 04:33:51 -0400 Received: from mailgw01.mediatek.com ([60.244.123.138]:43360 "EHLO mailgw01.mediatek.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S243358AbhIAIdf (ORCPT ); Wed, 1 Sep 2021 04:33:35 -0400 X-UUID: 41a033590e39428d92f64b0d4a8ff05b-20210901 X-UUID: 41a033590e39428d92f64b0d4a8ff05b-20210901 Received: from mtkexhb01.mediatek.inc [(172.21.101.102)] by mailgw01.mediatek.com (envelope-from ) (Generic MTA with TLSv1.2 ECDHE-RSA-AES256-SHA384 256/256) with ESMTP id 1757956000; Wed, 01 Sep 2021 16:32:36 +0800 Received: from MTKCAS06.mediatek.inc (172.21.101.30) by mtkmbs07n2.mediatek.inc (172.21.101.141) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Wed, 1 Sep 2021 16:32:34 +0800 Received: from localhost.localdomain (10.17.3.153) by MTKCAS06.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Wed, 1 Sep 2021 16:32:33 +0800 From: Yunfei Dong To: Yunfei Dong , Alexandre Courbot , Hans Verkuil , Tzung-Bi Shih , Tiffany Lin , Andrew-CT Chen , Mauro Carvalho Chehab , Rob Herring , Matthias Brugger , Tomasz Figa , Laurent Pinchart CC: Daniel Vetter , dri-devel , Hsin-Yi Wang , Fritz Koenig , Irui Wang , , , , , , , Subject: [PATCH v6, 11/15] media: mtk-vcodec: Add core thread Date: Wed, 1 Sep 2021 16:32:11 +0800 Message-ID: <20210901083215.25984-12-yunfei.dong@mediatek.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20210901083215.25984-1-yunfei.dong@mediatek.com> References: <20210901083215.25984-1-yunfei.dong@mediatek.com> MIME-Version: 1.0 Content-Type: text/plain X-MTK: N Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Core thread: 1. Gets lat_buf from core msg queue. 2. Proceeds core decode. 3. Puts the lat_buf back to lat msg queue. Both H264 and VP9 rely on the core thread. Signed-off-by: Yunfei Dong --- .../platform/mtk-vcodec/mtk_vcodec_dec_drv.c | 12 +++++++ .../platform/mtk-vcodec/mtk_vcodec_drv.h | 7 ++++ .../platform/mtk-vcodec/vdec_msg_queue.c | 32 +++++++++++++++++++ .../platform/mtk-vcodec/vdec_msg_queue.h | 6 ++++ 4 files changed, 57 insertions(+) diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_drv.c b/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_drv.c index e448cb238c7f..002352fcf8de 100644 --- a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_drv.c +++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_drv.c @@ -405,6 +405,18 @@ static int mtk_vcodec_probe(struct platform_device *pdev) goto err_dec_pm; } + if (VDEC_LAT_ARCH(dev->vdec_pdata->hw_arch)) { + vdec_msg_queue_init_ctx(&dev->msg_queue_core_ctx, + MTK_VDEC_CORE); + dev->kthread_core = kthread_run(vdec_msg_queue_core_thead, dev, + "mtk-%s", "core"); + if (IS_ERR(dev->kthread_core)) { + dev_err(&pdev->dev, "Failed to create core thread"); + ret = PTR_ERR(dev->kthread_core); + goto err_res; + } + } + for (i = 0; i < MTK_VDEC_HW_MAX; i++) mutex_init(&dev->dec_mutex[i]); spin_lock_init(&dev->irqlock); diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h b/drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h index f1e63acaec76..b6f030a6e55f 100644 --- a/drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h +++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h @@ -27,6 +27,7 @@ #define MTK_VCODEC_MAX_PLANES 3 #define MTK_V4L2_BENCHMARK 0 #define WAIT_INTR_TIMEOUT_MS 1000 +#define VDEC_LAT_ARCH(hw_arch) ((hw_arch) >= MTK_VDEC_LAT_SINGLE_CORE) /* * enum mtk_hw_reg_idx - MTK hw register base index @@ -465,6 +466,9 @@ struct mtk_vcodec_enc_pdata { * * @comp_dev: component hardware device * @component_node: component node + * + * @kthread_core: thread used for core hardware decode + * @msg_queue_core_ctx: msg queue context used for core thread */ struct mtk_vcodec_dev { struct v4l2_device v4l2_dev; @@ -505,6 +509,9 @@ struct mtk_vcodec_dev { void *comp_dev[MTK_VDEC_HW_MAX]; struct device_node *component_node[MTK_VDEC_HW_MAX]; + + struct task_struct *kthread_core; + struct vdec_msg_queue_ctx msg_queue_core_ctx; }; static inline struct mtk_vcodec_ctx *fh_to_ctx(struct v4l2_fh *fh) diff --git a/drivers/media/platform/mtk-vcodec/vdec_msg_queue.c b/drivers/media/platform/mtk-vcodec/vdec_msg_queue.c index d66ed98c79a9..665f571eab4b 100644 --- a/drivers/media/platform/mtk-vcodec/vdec_msg_queue.c +++ b/drivers/media/platform/mtk-vcodec/vdec_msg_queue.c @@ -256,3 +256,35 @@ void vdec_msg_queue_deinit( kfree(lat_buf->private_data); } } + +int vdec_msg_queue_core_thead(void *data) +{ + struct mtk_vcodec_dev *dev = data; + struct vdec_lat_buf *lat_buf; + struct mtk_vcodec_ctx *ctx; + + set_freezable(); + for (;;) { + try_to_freeze(); + if (kthread_should_stop()) + break; + + lat_buf = vdec_msg_queue_dqbuf(&dev->msg_queue_core_ctx); + if (!lat_buf) + continue; + + ctx = lat_buf->ctx; + mtk_vcodec_set_curr_ctx(dev, ctx, MTK_VDEC_CORE); + + if (!lat_buf->core_decode) + mtk_v4l2_err("Core decode callback func is NULL"); + else + lat_buf->core_decode(lat_buf); + + mtk_vcodec_set_curr_ctx(dev, NULL, MTK_VDEC_CORE); + vdec_msg_queue_qbuf(&ctx->msg_queue.lat_ctx, lat_buf); + } + + mtk_v4l2_debug(3, "Video Capture Thread End"); + return 0; +} diff --git a/drivers/media/platform/mtk-vcodec/vdec_msg_queue.h b/drivers/media/platform/mtk-vcodec/vdec_msg_queue.h index 1905ce713592..b5745b144140 100644 --- a/drivers/media/platform/mtk-vcodec/vdec_msg_queue.h +++ b/drivers/media/platform/mtk-vcodec/vdec_msg_queue.h @@ -148,4 +148,10 @@ void vdec_msg_queue_deinit( struct vdec_msg_queue *msg_queue, struct mtk_vcodec_ctx *ctx); +/** + * vdec_msg_queue_core_thead - used for core decoder. + * @data: private data used for each codec + */ +int vdec_msg_queue_core_thead(void *data); + #endif -- 2.25.1 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY, URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id EBF66C432BE for ; Wed, 1 Sep 2021 09:12:23 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id BA5E760F90 for ; Wed, 1 Sep 2021 09:12:23 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org BA5E760F90 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=mediatek.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.infradead.org 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=HDmGD5wF5hCsCoWsbgFyo/Rekz5S5yfzSi/HZLivvSU=; b=GVKzpjSQKa6k8B khpiI3ePSKSp983tqeMFKQZ2Ntavp1u9S1XZiNRy+vOkVxWgHOxIiI2EZC8QaFMhTfxOFC+TA+NEA ywH4bF1a+mH1pgYbSQwCJ4i+H5/0Y+s8miV5F1DzZz+D/UB6Afd47rqy3+P6JpxRD/mcy+DBnWx/p gJ9dS81muqXh8r84vqTgzk7YxoapqRftzYluDm2wx2BZ4obX01knVOYqybYXlLJRz/mwrLkKZ4W84 bh00k1xEhzzYYov/h+dVjrqxyd6ynL0pnu7BN1i1jBXih6XN2I1RyX6A3Fqq6/0RgEj3KSjMN5XcZ UC2P0+0+IzTqrJvD5n8w==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mLMHx-004nIh-Jg; Wed, 01 Sep 2021 09:12:09 +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 1mLLnc-004cWE-0p; Wed, 01 Sep 2021 08:40:52 +0000 X-UUID: 46858e72c49740778d19ec02ae350b73-20210901 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=Content-Transfer-Encoding:Content-Type:MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:CC:To:From; bh=55dJSJGKyDAD/xonwRz3FknU2dJJRxMhKdX7zs2wOOk=; b=LzsvzWVffzj0yyAWrnh53/Q2V988LIPf4o3n+GNcwqi5XwiB7eAeKYyBEiEiM56hHefeCh5ouZVBLTWW8EHrp/AQQjyN0NmcSSasFZL+0u62AlYwouLMAyRwA19LQnI0Gr4DhXrNKQJjZvpP0p99h7zbl2BzRooVV/djm5vyb3s=; X-UUID: 46858e72c49740778d19ec02ae350b73-20210901 Received: from mtkcas66.mediatek.inc [(172.29.193.44)] by mailgw01.mediatek.com (envelope-from ) (musrelay.mediatek.com ESMTP with TLSv1.2 ECDHE-RSA-AES256-SHA384 256/256) with ESMTP id 692452701; Wed, 01 Sep 2021 01:40:46 -0700 Received: from MTKMBS07N2.mediatek.inc (172.21.101.141) by MTKMBS62DR.mediatek.inc (172.29.94.18) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Wed, 1 Sep 2021 01:32:36 -0700 Received: from MTKCAS06.mediatek.inc (172.21.101.30) by mtkmbs07n2.mediatek.inc (172.21.101.141) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Wed, 1 Sep 2021 16:32:34 +0800 Received: from localhost.localdomain (10.17.3.153) by MTKCAS06.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Wed, 1 Sep 2021 16:32:33 +0800 From: Yunfei Dong To: Yunfei Dong , Alexandre Courbot , Hans Verkuil , "Tzung-Bi Shih" , Tiffany Lin , Andrew-CT Chen , Mauro Carvalho Chehab , Rob Herring , Matthias Brugger , Tomasz Figa , Laurent Pinchart CC: Daniel Vetter , dri-devel , Hsin-Yi Wang , "Fritz Koenig" , Irui Wang , , , , , , , Subject: [PATCH v6, 11/15] media: mtk-vcodec: Add core thread Date: Wed, 1 Sep 2021 16:32:11 +0800 Message-ID: <20210901083215.25984-12-yunfei.dong@mediatek.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20210901083215.25984-1-yunfei.dong@mediatek.com> References: <20210901083215.25984-1-yunfei.dong@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-20210901_014048_184548_588D079B X-CRM114-Status: GOOD ( 18.79 ) 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: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "Linux-mediatek" Errors-To: linux-mediatek-bounces+linux-mediatek=archiver.kernel.org@lists.infradead.org Core thread: 1. Gets lat_buf from core msg queue. 2. Proceeds core decode. 3. Puts the lat_buf back to lat msg queue. Both H264 and VP9 rely on the core thread. Signed-off-by: Yunfei Dong --- .../platform/mtk-vcodec/mtk_vcodec_dec_drv.c | 12 +++++++ .../platform/mtk-vcodec/mtk_vcodec_drv.h | 7 ++++ .../platform/mtk-vcodec/vdec_msg_queue.c | 32 +++++++++++++++++++ .../platform/mtk-vcodec/vdec_msg_queue.h | 6 ++++ 4 files changed, 57 insertions(+) diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_drv.c b/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_drv.c index e448cb238c7f..002352fcf8de 100644 --- a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_drv.c +++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_drv.c @@ -405,6 +405,18 @@ static int mtk_vcodec_probe(struct platform_device *pdev) goto err_dec_pm; } + if (VDEC_LAT_ARCH(dev->vdec_pdata->hw_arch)) { + vdec_msg_queue_init_ctx(&dev->msg_queue_core_ctx, + MTK_VDEC_CORE); + dev->kthread_core = kthread_run(vdec_msg_queue_core_thead, dev, + "mtk-%s", "core"); + if (IS_ERR(dev->kthread_core)) { + dev_err(&pdev->dev, "Failed to create core thread"); + ret = PTR_ERR(dev->kthread_core); + goto err_res; + } + } + for (i = 0; i < MTK_VDEC_HW_MAX; i++) mutex_init(&dev->dec_mutex[i]); spin_lock_init(&dev->irqlock); diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h b/drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h index f1e63acaec76..b6f030a6e55f 100644 --- a/drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h +++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h @@ -27,6 +27,7 @@ #define MTK_VCODEC_MAX_PLANES 3 #define MTK_V4L2_BENCHMARK 0 #define WAIT_INTR_TIMEOUT_MS 1000 +#define VDEC_LAT_ARCH(hw_arch) ((hw_arch) >= MTK_VDEC_LAT_SINGLE_CORE) /* * enum mtk_hw_reg_idx - MTK hw register base index @@ -465,6 +466,9 @@ struct mtk_vcodec_enc_pdata { * * @comp_dev: component hardware device * @component_node: component node + * + * @kthread_core: thread used for core hardware decode + * @msg_queue_core_ctx: msg queue context used for core thread */ struct mtk_vcodec_dev { struct v4l2_device v4l2_dev; @@ -505,6 +509,9 @@ struct mtk_vcodec_dev { void *comp_dev[MTK_VDEC_HW_MAX]; struct device_node *component_node[MTK_VDEC_HW_MAX]; + + struct task_struct *kthread_core; + struct vdec_msg_queue_ctx msg_queue_core_ctx; }; static inline struct mtk_vcodec_ctx *fh_to_ctx(struct v4l2_fh *fh) diff --git a/drivers/media/platform/mtk-vcodec/vdec_msg_queue.c b/drivers/media/platform/mtk-vcodec/vdec_msg_queue.c index d66ed98c79a9..665f571eab4b 100644 --- a/drivers/media/platform/mtk-vcodec/vdec_msg_queue.c +++ b/drivers/media/platform/mtk-vcodec/vdec_msg_queue.c @@ -256,3 +256,35 @@ void vdec_msg_queue_deinit( kfree(lat_buf->private_data); } } + +int vdec_msg_queue_core_thead(void *data) +{ + struct mtk_vcodec_dev *dev = data; + struct vdec_lat_buf *lat_buf; + struct mtk_vcodec_ctx *ctx; + + set_freezable(); + for (;;) { + try_to_freeze(); + if (kthread_should_stop()) + break; + + lat_buf = vdec_msg_queue_dqbuf(&dev->msg_queue_core_ctx); + if (!lat_buf) + continue; + + ctx = lat_buf->ctx; + mtk_vcodec_set_curr_ctx(dev, ctx, MTK_VDEC_CORE); + + if (!lat_buf->core_decode) + mtk_v4l2_err("Core decode callback func is NULL"); + else + lat_buf->core_decode(lat_buf); + + mtk_vcodec_set_curr_ctx(dev, NULL, MTK_VDEC_CORE); + vdec_msg_queue_qbuf(&ctx->msg_queue.lat_ctx, lat_buf); + } + + mtk_v4l2_debug(3, "Video Capture Thread End"); + return 0; +} diff --git a/drivers/media/platform/mtk-vcodec/vdec_msg_queue.h b/drivers/media/platform/mtk-vcodec/vdec_msg_queue.h index 1905ce713592..b5745b144140 100644 --- a/drivers/media/platform/mtk-vcodec/vdec_msg_queue.h +++ b/drivers/media/platform/mtk-vcodec/vdec_msg_queue.h @@ -148,4 +148,10 @@ void vdec_msg_queue_deinit( struct vdec_msg_queue *msg_queue, struct mtk_vcodec_ctx *ctx); +/** + * vdec_msg_queue_core_thead - used for core decoder. + * @data: private data used for each codec + */ +int vdec_msg_queue_core_thead(void *data); + #endif -- 2.25.1 _______________________________________________ Linux-mediatek mailing list Linux-mediatek@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-mediatek From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY, URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 60E3AC432BE for ; Wed, 1 Sep 2021 09:17:18 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 29C9F61053 for ; Wed, 1 Sep 2021 09:17:18 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 29C9F61053 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=mediatek.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.infradead.org 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=uWDza2eDQVzUd+fs5zYQtISWA2pVXVr95W68hmBEM50=; b=VU5dXHscpdcx3M 9azJDFvPYOLF1XtKJc/8F08KHTUmUZbr5NFxMu+Ha3ckUckG5OA1aVjEXlBVIcNnxFpmGSCFzD0Qv m3YquBG54ZRrsBY7ZPQWp6M0xIeK56I/sPVqo9AyX6fzGpb2R3o2D4Nzib3D0CmEnBGAxpnlcnS4t 9BvUWVyppSIOEemNJQ86e7sIPHiXV8d5cffhRW5LwrRxoq4nnZe01c2ne/Nuq8uByzq0gwN6BuvqZ UigaHygyqYizyFBmnerDnHQ1S+bwY5s8RCNCmlKWj4GV60PsfpON5PXiZF9FuhTt8nJbeChz+HCOR 8DiNAVAY283lIWCNT6eQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mLMJv-004nua-9c; Wed, 01 Sep 2021 09:14:12 +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 1mLLnc-004cWE-0p; Wed, 01 Sep 2021 08:40:52 +0000 X-UUID: 46858e72c49740778d19ec02ae350b73-20210901 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=Content-Transfer-Encoding:Content-Type:MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:CC:To:From; bh=55dJSJGKyDAD/xonwRz3FknU2dJJRxMhKdX7zs2wOOk=; b=LzsvzWVffzj0yyAWrnh53/Q2V988LIPf4o3n+GNcwqi5XwiB7eAeKYyBEiEiM56hHefeCh5ouZVBLTWW8EHrp/AQQjyN0NmcSSasFZL+0u62AlYwouLMAyRwA19LQnI0Gr4DhXrNKQJjZvpP0p99h7zbl2BzRooVV/djm5vyb3s=; X-UUID: 46858e72c49740778d19ec02ae350b73-20210901 Received: from mtkcas66.mediatek.inc [(172.29.193.44)] by mailgw01.mediatek.com (envelope-from ) (musrelay.mediatek.com ESMTP with TLSv1.2 ECDHE-RSA-AES256-SHA384 256/256) with ESMTP id 692452701; Wed, 01 Sep 2021 01:40:46 -0700 Received: from MTKMBS07N2.mediatek.inc (172.21.101.141) by MTKMBS62DR.mediatek.inc (172.29.94.18) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Wed, 1 Sep 2021 01:32:36 -0700 Received: from MTKCAS06.mediatek.inc (172.21.101.30) by mtkmbs07n2.mediatek.inc (172.21.101.141) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Wed, 1 Sep 2021 16:32:34 +0800 Received: from localhost.localdomain (10.17.3.153) by MTKCAS06.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Wed, 1 Sep 2021 16:32:33 +0800 From: Yunfei Dong To: Yunfei Dong , Alexandre Courbot , Hans Verkuil , "Tzung-Bi Shih" , Tiffany Lin , Andrew-CT Chen , Mauro Carvalho Chehab , Rob Herring , Matthias Brugger , Tomasz Figa , Laurent Pinchart CC: Daniel Vetter , dri-devel , Hsin-Yi Wang , "Fritz Koenig" , Irui Wang , , , , , , , Subject: [PATCH v6, 11/15] media: mtk-vcodec: Add core thread Date: Wed, 1 Sep 2021 16:32:11 +0800 Message-ID: <20210901083215.25984-12-yunfei.dong@mediatek.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20210901083215.25984-1-yunfei.dong@mediatek.com> References: <20210901083215.25984-1-yunfei.dong@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-20210901_014048_184548_588D079B X-CRM114-Status: GOOD ( 18.79 ) 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: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Core thread: 1. Gets lat_buf from core msg queue. 2. Proceeds core decode. 3. Puts the lat_buf back to lat msg queue. Both H264 and VP9 rely on the core thread. Signed-off-by: Yunfei Dong --- .../platform/mtk-vcodec/mtk_vcodec_dec_drv.c | 12 +++++++ .../platform/mtk-vcodec/mtk_vcodec_drv.h | 7 ++++ .../platform/mtk-vcodec/vdec_msg_queue.c | 32 +++++++++++++++++++ .../platform/mtk-vcodec/vdec_msg_queue.h | 6 ++++ 4 files changed, 57 insertions(+) diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_drv.c b/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_drv.c index e448cb238c7f..002352fcf8de 100644 --- a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_drv.c +++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_drv.c @@ -405,6 +405,18 @@ static int mtk_vcodec_probe(struct platform_device *pdev) goto err_dec_pm; } + if (VDEC_LAT_ARCH(dev->vdec_pdata->hw_arch)) { + vdec_msg_queue_init_ctx(&dev->msg_queue_core_ctx, + MTK_VDEC_CORE); + dev->kthread_core = kthread_run(vdec_msg_queue_core_thead, dev, + "mtk-%s", "core"); + if (IS_ERR(dev->kthread_core)) { + dev_err(&pdev->dev, "Failed to create core thread"); + ret = PTR_ERR(dev->kthread_core); + goto err_res; + } + } + for (i = 0; i < MTK_VDEC_HW_MAX; i++) mutex_init(&dev->dec_mutex[i]); spin_lock_init(&dev->irqlock); diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h b/drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h index f1e63acaec76..b6f030a6e55f 100644 --- a/drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h +++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h @@ -27,6 +27,7 @@ #define MTK_VCODEC_MAX_PLANES 3 #define MTK_V4L2_BENCHMARK 0 #define WAIT_INTR_TIMEOUT_MS 1000 +#define VDEC_LAT_ARCH(hw_arch) ((hw_arch) >= MTK_VDEC_LAT_SINGLE_CORE) /* * enum mtk_hw_reg_idx - MTK hw register base index @@ -465,6 +466,9 @@ struct mtk_vcodec_enc_pdata { * * @comp_dev: component hardware device * @component_node: component node + * + * @kthread_core: thread used for core hardware decode + * @msg_queue_core_ctx: msg queue context used for core thread */ struct mtk_vcodec_dev { struct v4l2_device v4l2_dev; @@ -505,6 +509,9 @@ struct mtk_vcodec_dev { void *comp_dev[MTK_VDEC_HW_MAX]; struct device_node *component_node[MTK_VDEC_HW_MAX]; + + struct task_struct *kthread_core; + struct vdec_msg_queue_ctx msg_queue_core_ctx; }; static inline struct mtk_vcodec_ctx *fh_to_ctx(struct v4l2_fh *fh) diff --git a/drivers/media/platform/mtk-vcodec/vdec_msg_queue.c b/drivers/media/platform/mtk-vcodec/vdec_msg_queue.c index d66ed98c79a9..665f571eab4b 100644 --- a/drivers/media/platform/mtk-vcodec/vdec_msg_queue.c +++ b/drivers/media/platform/mtk-vcodec/vdec_msg_queue.c @@ -256,3 +256,35 @@ void vdec_msg_queue_deinit( kfree(lat_buf->private_data); } } + +int vdec_msg_queue_core_thead(void *data) +{ + struct mtk_vcodec_dev *dev = data; + struct vdec_lat_buf *lat_buf; + struct mtk_vcodec_ctx *ctx; + + set_freezable(); + for (;;) { + try_to_freeze(); + if (kthread_should_stop()) + break; + + lat_buf = vdec_msg_queue_dqbuf(&dev->msg_queue_core_ctx); + if (!lat_buf) + continue; + + ctx = lat_buf->ctx; + mtk_vcodec_set_curr_ctx(dev, ctx, MTK_VDEC_CORE); + + if (!lat_buf->core_decode) + mtk_v4l2_err("Core decode callback func is NULL"); + else + lat_buf->core_decode(lat_buf); + + mtk_vcodec_set_curr_ctx(dev, NULL, MTK_VDEC_CORE); + vdec_msg_queue_qbuf(&ctx->msg_queue.lat_ctx, lat_buf); + } + + mtk_v4l2_debug(3, "Video Capture Thread End"); + return 0; +} diff --git a/drivers/media/platform/mtk-vcodec/vdec_msg_queue.h b/drivers/media/platform/mtk-vcodec/vdec_msg_queue.h index 1905ce713592..b5745b144140 100644 --- a/drivers/media/platform/mtk-vcodec/vdec_msg_queue.h +++ b/drivers/media/platform/mtk-vcodec/vdec_msg_queue.h @@ -148,4 +148,10 @@ void vdec_msg_queue_deinit( struct vdec_msg_queue *msg_queue, struct mtk_vcodec_ctx *ctx); +/** + * vdec_msg_queue_core_thead - used for core decoder. + * @data: private data used for each codec + */ +int vdec_msg_queue_core_thead(void *data); + #endif -- 2.25.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel