From nobody Sat Sep 21 12:33:18 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 0EFB5C46467 for ; Thu, 24 Nov 2022 12:52:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229888AbiKXMwn (ORCPT ); Thu, 24 Nov 2022 07:52:43 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36720 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229817AbiKXMwf (ORCPT ); Thu, 24 Nov 2022 07:52:35 -0500 Received: from mailgw01.mediatek.com (unknown [60.244.123.138]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 64B2FDEF3; Thu, 24 Nov 2022 04:52:33 -0800 (PST) X-UUID: d82a9581db504d8d8f6a773bf82eefdb-20221124 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=Content-Type:MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:CC:To:From; bh=1MthmATFQNfNnvP0lOFpmusCFZR/WLYgS8eeinmcLUA=; b=GbIGzf0zUp7R+UmHQkxw0oH7dYENyLenWXgbAUuSL8QqjhkOQe954bUKsDPlaLqAmud9TBSIPrJNyUfoWOXNwpw7oF/0toZg+bbWEygM6JI9L0HuqTDFjByYO0M8pj+YIYwo7yMiw0NqxCvdRDcTHIVdX/x/X5xVzAkBfrN+yeg=; X-CID-P-RULE: Release_Ham X-CID-O-INFO: VERSION:1.1.14,REQID:7fd0b013-4f46-4e07-a815-a134590ef0fa,IP:0,U RL:0,TC:0,Content:0,EDM:0,RT:0,SF:0,FILE:0,BULK:0,RULE:Release_Ham,ACTION: release,TS:0 X-CID-META: VersionHash:dcaaed0,CLOUDID:84b625dc-6ad4-42ff-91f3-18e0272db660,B ulkID:nil,BulkQuantity:0,Recheck:0,SF:102,TC:nil,Content:0,EDM:-3,IP:nil,U RL:0,File:nil,Bulk:nil,QS:nil,BEC:nil,COL:0 X-UUID: d82a9581db504d8d8f6a773bf82eefdb-20221124 Received: from mtkmbs13n2.mediatek.inc [(172.21.101.108)] by mailgw01.mediatek.com (envelope-from ) (Generic MTA with TLSv1.2 ECDHE-RSA-AES256-GCM-SHA384 256/256) with ESMTP id 603584742; Thu, 24 Nov 2022 20:52:28 +0800 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; Thu, 24 Nov 2022 20:52:27 +0800 Received: from mtksdccf07.mediatek.inc (172.21.84.99) by mtkmbs11n1.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.2.792.15 via Frontend Transport; Thu, 24 Nov 2022 20:52:27 +0800 From: Moudy Ho To: Mauro Carvalho Chehab , Matthias Brugger , Hans Verkuil CC: Chun-Kuang Hu , , , , , Moudy Ho Subject: [PATCH v1 05/12] media: platform: mtk-mdp3: introduce more pipelines from 8195 Date: Thu, 24 Nov 2022 20:52:18 +0800 Message-ID: <20221124125225.24538-6-moudy.ho@mediatek.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20221124125225.24538-1-moudy.ho@mediatek.com> References: <20221124125225.24538-1-moudy.ho@mediatek.com> MIME-Version: 1.0 X-MTK: N Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" By expanding the MMSYS and MUTEX of each two sets in MT8195, more pipelines can be arranged. Signed-off-by: Moudy Ho --- .../platform/mediatek/mdp3/mtk-mdp3-cmdq.c | 80 ++++++++++++------- .../platform/mediatek/mdp3/mtk-mdp3-core.h | 7 ++ 2 files changed, 60 insertions(+), 27 deletions(-) diff --git a/drivers/media/platform/mediatek/mdp3/mtk-mdp3-cmdq.c b/drivers= /media/platform/mediatek/mdp3/mtk-mdp3-cmdq.c index 5472d7183a5e..365efe6a6c92 100644 --- a/drivers/media/platform/mediatek/mdp3/mtk-mdp3-cmdq.c +++ b/drivers/media/platform/mediatek/mdp3/mtk-mdp3-cmdq.c @@ -56,6 +56,43 @@ static struct mtk_mutex *__get_mutex(const struct mdp_de= v *mdp_dev, return m; } =20 +static enum mdp_pipe_id __get_pipe(const struct mdp_dev *mdp_dev, + enum mtk_mdp_comp_id id) +{ + enum mdp_pipe_id pipe_id; + + switch (id) { + case MDP_COMP_RDMA0: + pipe_id =3D MDP_PIPE_RDMA0; + break; + case MDP_COMP_ISP_IMGI: + pipe_id =3D MDP_PIPE_IMGI; + break; + case MDP_COMP_WPEI: + pipe_id =3D MDP_PIPE_WPEI; + break; + case MDP_COMP_WPEI2: + pipe_id =3D MDP_PIPE_WPEI2; + break; + case MDP_COMP_RDMA1: + pipe_id =3D MDP_PIPE_RDMA1; + break; + case MDP_COMP_RDMA2: + pipe_id =3D MDP_PIPE_RDMA2; + break; + case MDP_COMP_RDMA3: + pipe_id =3D MDP_PIPE_RDMA3; + break; + default: + /* Avoid exceptions when operating MUTEX */ + pipe_id =3D MDP_PIPE_RDMA0; + dev_err(&mdp_dev->pdev->dev, "Unknown pipeline id %d", id); + break; + } + + return pipe_id; +} + static int mdp_path_subfrm_require(const struct mdp_path *path, struct mdp_cmdq_cmd *cmd, struct mdp_pipe_info *p, u32 count) @@ -63,7 +100,6 @@ static int mdp_path_subfrm_require(const struct mdp_path= *path, const int plat_id =3D path->mdp_dev->mdp_data->mdp_plat_id; const struct mdp_comp_ctx *ctx; const struct mtk_mdp_driver_data *data =3D path->mdp_dev->mdp_data; - struct device *dev =3D &path->mdp_dev->pdev->dev; struct mtk_mutex *mutex; int id, index; u32 num_comp =3D 0; @@ -72,23 +108,7 @@ static int mdp_path_subfrm_require(const struct mdp_pat= h *path, num_comp =3D CFG_GET(MT8183, path->config, num_components); =20 /* Decide which mutex to use based on the current pipeline */ - switch (path->comps[0].comp->public_id) { - case MDP_COMP_RDMA0: - index =3D MDP_PIPE_RDMA0; - break; - case MDP_COMP_ISP_IMGI: - index =3D MDP_PIPE_IMGI; - break; - case MDP_COMP_WPEI: - index =3D MDP_PIPE_WPEI; - break; - case MDP_COMP_WPEI2: - index =3D MDP_PIPE_WPEI2; - break; - default: - dev_err(dev, "Unknown pipeline and no mutex is assigned"); - return -EINVAL; - } + index =3D __get_pipe(path->mdp_dev, path->comps[0].comp->public_id); memcpy(p, &data->pipe_info[index], sizeof(struct mdp_pipe_info)); mutex =3D __get_mutex(path->mdp_dev, p); =20 @@ -342,11 +362,13 @@ static void mdp_auto_release_work(struct work_struct = *work) struct mdp_cmdq_cmd *cmd; struct mdp_dev *mdp; struct mtk_mutex *mutex; + enum mdp_pipe_id pipe_id; =20 cmd =3D container_of(work, struct mdp_cmdq_cmd, auto_release_work); mdp =3D cmd->mdp; =20 - mutex =3D __get_mutex(mdp, &mdp->mdp_data->pipe_info[MDP_PIPE_RDMA0]); + pipe_id =3D __get_pipe(mdp, cmd->comps[0].public_id); + mutex =3D __get_mutex(mdp, &mdp->mdp_data->pipe_info[pipe_id]); mtk_mutex_unprepare(mutex); mdp_comp_clocks_off(&mdp->pdev->dev, cmd->comps, cmd->num_comps); @@ -367,6 +389,7 @@ static void mdp_handle_cmdq_callback(struct mbox_client= *cl, void *mssg) struct cmdq_cb_data *data; struct mdp_dev *mdp; struct device *dev; + enum mdp_pipe_id pipe_id; =20 if (!mssg) { pr_info("%s:no callback data\n", __func__); @@ -394,7 +417,8 @@ static void mdp_handle_cmdq_callback(struct mbox_client= *cl, void *mssg) struct mtk_mutex *mutex; =20 dev_err(dev, "%s:queue_work fail!\n", __func__); - mutex =3D __get_mutex(mdp, &mdp->mdp_data->pipe_info[MDP_PIPE_RDMA0]); + pipe_id =3D __get_pipe(mdp, cmd->comps[0].public_id); + mutex =3D __get_mutex(mdp, &mdp->mdp_data->pipe_info[pipe_id]); mtk_mutex_unprepare(mutex); mdp_comp_clocks_off(&mdp->pdev->dev, cmd->comps, cmd->num_comps); @@ -417,6 +441,7 @@ int mdp_cmdq_send(struct mdp_dev *mdp, struct mdp_cmdq_= param *param) struct mdp_comp *comps =3D NULL; struct device *dev =3D &mdp->pdev->dev; struct mtk_mutex *mutex =3D NULL; + enum mdp_pipe_id pipe_id; const int id =3D mdp->mdp_data->mdp_plat_id; int i, ret; u32 num_comp =3D 0; @@ -453,13 +478,6 @@ int mdp_cmdq_send(struct mdp_dev *mdp, struct mdp_cmdq= _param *param) goto err_free_comps; } =20 - mutex =3D __get_mutex(mdp, &mdp->mdp_data->pipe_info[MDP_PIPE_RDMA0]); - ret =3D mtk_mutex_prepare(mutex); - if (ret) { - dev_err(dev, "Fail to enable mutex clk\n"); - goto err_free_path; - } - path->mdp_dev =3D mdp; path->config =3D param->config; path->param =3D param->param; @@ -479,6 +497,14 @@ int mdp_cmdq_send(struct mdp_dev *mdp, struct mdp_cmdq= _param *param) goto err_free_path; } =20 + pipe_id =3D __get_pipe(mdp, path->comps[0].comp->public_id); + mutex =3D __get_mutex(mdp, &mdp->mdp_data->pipe_info[pipe_id]); + ret =3D mtk_mutex_prepare(mutex); + if (ret) { + dev_err(dev, "Fail to enable mutex clk\n"); + goto err_free_path; + } + ret =3D mdp_path_config(mdp, cmd, path); if (ret) { dev_err(dev, "mdp_path_config error\n"); diff --git a/drivers/media/platform/mediatek/mdp3/mtk-mdp3-core.h b/drivers= /media/platform/mediatek/mdp3/mtk-mdp3-core.h index 3ffad6be95ad..49b6e9c8e089 100644 --- a/drivers/media/platform/mediatek/mdp3/mtk-mdp3-core.h +++ b/drivers/media/platform/mediatek/mdp3/mtk-mdp3-core.h @@ -49,6 +49,13 @@ enum mdp_pipe_id { MDP_PIPE_IMGI, MDP_PIPE_WPEI, MDP_PIPE_WPEI2, + MDP_PIPE_RDMA1, + MDP_PIPE_RDMA2, + MDP_PIPE_RDMA3, + MDP_PIPE_SPLIT, + MDP_PIPE_SPLIT2, + MDP_PIPE_VPP0_SOUT, + MDP_PIPE_VPP1_SOUT, MDP_PIPE_MAX }; =20 --=20 2.18.0