From nobody Sun Sep 22 07:43:01 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 C266FC43217 for ; Thu, 17 Mar 2022 14:39:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235193AbiCQOk7 (ORCPT ); Thu, 17 Mar 2022 10:40:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56300 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233023AbiCQOk5 (ORCPT ); Thu, 17 Mar 2022 10:40:57 -0400 Received: from mailgw02.mediatek.com (unknown [210.61.82.184]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 23FFDC6EF1; Thu, 17 Mar 2022 07:39:35 -0700 (PDT) X-UUID: 4a3bfdb1296545edb3f92f586b2cb699-20220317 X-UUID: 4a3bfdb1296545edb3f92f586b2cb699-20220317 Received: from mtkcas11.mediatek.inc [(172.21.101.40)] by mailgw02.mediatek.com (envelope-from ) (Generic MTA with TLSv1.2 ECDHE-RSA-AES256-SHA384 256/256) with ESMTP id 1557970165; Thu, 17 Mar 2022 22:39:29 +0800 Received: from mtkcas11.mediatek.inc (172.21.101.40) by mtkmbs10n1.mediatek.inc (172.21.101.34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.2.792.15; Thu, 17 Mar 2022 22:39:28 +0800 Received: from mtksdccf07.mediatek.inc (172.21.84.99) by mtkcas11.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Thu, 17 Mar 2022 22:39:28 +0800 From: Moudy Ho To: Mauro Carvalho Chehab , Rob Herring , Matthias Brugger , Hans Verkuil , Jernej Skrabec CC: Chun-Kuang Hu , Geert Uytterhoeven , Rob Landley , Laurent Pinchart , , , , , , Alexandre Courbot , , , , , AngeloGioacchino Del Regno , Maoguang Meng , daoyuan huang , Ping-Hsun Wu , , , , , , , , , , Subject: [PATCH v14 2/6] soc: mediatek: mutex: add 8183 MUTEX MOD settings for MDP Date: Thu, 17 Mar 2022 22:39:22 +0800 Message-ID: <20220317143926.15835-3-moudy.ho@mediatek.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20220317143926.15835-1-moudy.ho@mediatek.com> References: <20220317143926.15835-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" For the purpose of module independence, related settings should be moved from MDP to the corresponding driver. This patch adds 8183 MUTEX MOD settings for MDP. Signed-off-by: Moudy Ho --- drivers/soc/mediatek/mtk-mutex.c | 37 ++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/drivers/soc/mediatek/mtk-mutex.c b/drivers/soc/mediatek/mtk-mu= tex.c index f8c33186685a..c72e9f6ee4cc 100644 --- a/drivers/soc/mediatek/mtk-mutex.c +++ b/drivers/soc/mediatek/mtk-mutex.c @@ -80,6 +80,15 @@ #define MT8183_MUTEX_MOD_DISP_GAMMA0 16 #define MT8183_MUTEX_MOD_DISP_DITHER0 17 =20 +#define MT8183_MUTEX_MOD_MDP_RDMA0 2 +#define MT8183_MUTEX_MOD_MDP_RSZ0 4 +#define MT8183_MUTEX_MOD_MDP_RSZ1 5 +#define MT8183_MUTEX_MOD_MDP_TDSHP0 6 +#define MT8183_MUTEX_MOD_MDP_WROT0 7 +#define MT8183_MUTEX_MOD_MDP_WDMA 8 +#define MT8183_MUTEX_MOD_MDP_AAL0 23 +#define MT8183_MUTEX_MOD_MDP_CCORR0 24 + #define MT8173_MUTEX_MOD_DISP_OVL0 11 #define MT8173_MUTEX_MOD_DISP_OVL1 12 #define MT8173_MUTEX_MOD_DISP_RDMA0 13 @@ -249,6 +258,33 @@ static const unsigned int mt8183_mutex_mod[DDP_COMPONE= NT_ID_MAX] =3D { [DDP_COMPONENT_WDMA0] =3D MT8183_MUTEX_MOD_DISP_WDMA0, }; =20 +static const struct mtk_mutex_mod mt8183_mutex_table_mod[MUTEX_TABLE_IDX_M= AX] =3D { + [MUTEX_TABLE_IDX_MDP_RDMA0] =3D { + 0, MT8183_MUTEX_MOD_MDP_RDMA0 + }, + [MUTEX_TABLE_IDX_MDP_RSZ0] =3D { + 0, MT8183_MUTEX_MOD_MDP_RSZ0 + }, + [MUTEX_TABLE_IDX_MDP_RSZ1] =3D { + 0, MT8183_MUTEX_MOD_MDP_RSZ1 + }, + [MUTEX_TABLE_IDX_MDP_TDSHP0] =3D { + 0, MT8183_MUTEX_MOD_MDP_TDSHP0 + }, + [MUTEX_TABLE_IDX_MDP_WROT0] =3D { + 0, MT8183_MUTEX_MOD_MDP_WROT0 + }, + [MUTEX_TABLE_IDX_MDP_WDMA] =3D { + 0, MT8183_MUTEX_MOD_MDP_WDMA + }, + [MUTEX_TABLE_IDX_MDP_AAL0] =3D { + 0, MT8183_MUTEX_MOD_MDP_AAL0 + }, + [MUTEX_TABLE_IDX_MDP_CCORR0] =3D { + 0, MT8183_MUTEX_MOD_MDP_CCORR0 + }, +}; + static const unsigned int mt8186_mutex_mod[DDP_COMPONENT_ID_MAX] =3D { [DDP_COMPONENT_AAL0] =3D MT8186_MUTEX_MOD_DISP_AAL0, [DDP_COMPONENT_CCORR] =3D MT8186_MUTEX_MOD_DISP_CCORR0, @@ -340,6 +376,7 @@ static const struct mtk_mutex_data mt8183_mutex_driver_= data =3D { .mutex_sof =3D mt8183_mutex_sof, .mutex_mod_reg =3D MT8183_MUTEX0_MOD0, .mutex_sof_reg =3D MT8183_MUTEX0_SOF0, + .mutex_table_mod =3D mt8183_mutex_table_mod, .no_clk =3D true, }; =20 --=20 2.18.0