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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 82FE6C433FE for ; Thu, 2 Dec 2021 06:13:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1355800AbhLBGRG (ORCPT ); Thu, 2 Dec 2021 01:17:06 -0500 Received: from mailgw02.mediatek.com ([210.61.82.184]:49364 "EHLO mailgw02.mediatek.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1355730AbhLBGQx (ORCPT ); Thu, 2 Dec 2021 01:16:53 -0500 X-UUID: 303ce383cfcf425cacb4f8a27d838ed4-20211202 X-UUID: 303ce383cfcf425cacb4f8a27d838ed4-20211202 Received: from mtkmbs10n2.mediatek.inc [(172.21.101.183)] by mailgw02.mediatek.com (envelope-from ) (Generic MTA with TLSv1.2 ECDHE-RSA-AES256-GCM-SHA384 256/256) with ESMTP id 1159303233; Thu, 02 Dec 2021 14:13:26 +0800 Received: from mtkcas10.mediatek.inc (172.21.101.39) by mtkmbs07n1.mediatek.inc (172.21.101.16) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Thu, 2 Dec 2021 14:13:25 +0800 Received: from mtksdccf07.mediatek.inc (172.21.84.99) by mtkcas10.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Thu, 2 Dec 2021 14:13:24 +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 v10 2/4] soc: mediatek: mmsys: add support for ISP control Date: Thu, 2 Dec 2021 14:13:20 +0800 Message-ID: <20211202061322.19917-3-moudy.ho@mediatek.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20211202061322.19917-1-moudy.ho@mediatek.com> References: <20211202061322.19917-1-moudy.ho@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 This patch adds 8183 ISP settings in MMSYS domain and interface. Signed-off-by: Moudy Ho --- drivers/soc/mediatek/mt8183-mmsys.h | 26 ++++++ drivers/soc/mediatek/mtk-mmsys.c | 117 +++++++++++++++++++++++++ drivers/soc/mediatek/mtk-mmsys.h | 1 + include/linux/soc/mediatek/mtk-mmsys.h | 30 +++++++ 4 files changed, 174 insertions(+) diff --git a/drivers/soc/mediatek/mt8183-mmsys.h b/drivers/soc/mediatek/mt8183-mmsys.h index 48865973314d..afc98c4dac95 100644 --- a/drivers/soc/mediatek/mt8183-mmsys.h +++ b/drivers/soc/mediatek/mt8183-mmsys.h @@ -32,6 +32,18 @@ #define MT8183_MDP_CCORR_SEL_IN 0xff0 #define MT8183_MDP_CCORR_SOUT_SEL 0xff4 +#define MT8183_ISP_REG_MMSYS_SW0_RST_B 0x140 +#define MT8183_ISP_REG_MMSYS_SW1_RST_B 0x144 +#define MT8183_ISP_REG_MDP_ASYNC_CFG_WD 0x934 +#define MT8183_ISP_REG_MDP_ASYNC_IPU_CFG_WD 0x93C +#define MT8183_ISP_REG_ISP_RELAY_CFG_WD 0x994 +#define MT8183_ISP_REG_IPU_RELAY_CFG_WD 0x9a0 +#define MT8183_ISP_BIT_MDP_DL_ASYNC_TX BIT(3) +#define MT8183_ISP_BIT_MDP_DL_ASYNC_TX2 BIT(4) +#define MT8183_ISP_BIT_MDP_DL_ASYNC_RX BIT(10) +#define MT8183_ISP_BIT_MDP_DL_ASYNC_RX2 BIT(11) +#define MT8183_ISP_BIT_NO_SOF_MODE BIT(31) + #define MT8183_OVL0_MOUT_EN_OVL0_2L BIT(4) #define MT8183_OVL0_2L_MOUT_EN_DISP_PATH0 BIT(0) #define MT8183_OVL1_2L_MOUT_EN_RDMA1 BIT(4) @@ -325,5 +337,19 @@ static const struct mtk_mmsys_routes mmsys_mt8183_mdp_routing_table[] = { } }; +static const unsigned int mmsys_mt8183_mdp_isp_ctrl_table[ISP_CTRL_MAX] = { + [ISP_REG_MMSYS_SW0_RST_B] = MT8183_ISP_REG_MMSYS_SW0_RST_B, + [ISP_REG_MMSYS_SW1_RST_B] = MT8183_ISP_REG_MMSYS_SW1_RST_B, + [ISP_REG_MDP_ASYNC_CFG_WD] = MT8183_ISP_REG_MDP_ASYNC_CFG_WD, + [ISP_REG_MDP_ASYNC_IPU_CFG_WD] = MT8183_ISP_REG_MDP_ASYNC_IPU_CFG_WD, + [ISP_REG_ISP_RELAY_CFG_WD] = MT8183_ISP_REG_ISP_RELAY_CFG_WD, + [ISP_REG_IPU_RELAY_CFG_WD] = MT8183_ISP_REG_IPU_RELAY_CFG_WD, + [ISP_BIT_MDP_DL_ASYNC_TX] = MT8183_ISP_BIT_MDP_DL_ASYNC_TX, + [ISP_BIT_MDP_DL_ASYNC_TX2] = MT8183_ISP_BIT_MDP_DL_ASYNC_TX2, + [ISP_BIT_MDP_DL_ASYNC_RX] = MT8183_ISP_BIT_MDP_DL_ASYNC_RX, + [ISP_BIT_MDP_DL_ASYNC_RX2] = MT8183_ISP_BIT_MDP_DL_ASYNC_RX2, + [ISP_BIT_NO_SOF_MODE] = MT8183_ISP_BIT_NO_SOF_MODE, +}; + #endif /* __SOC_MEDIATEK_MT8183_MMSYS_H */ diff --git a/drivers/soc/mediatek/mtk-mmsys.c b/drivers/soc/mediatek/mtk-mmsys.c index 905847d6e16c..cfbf36e6e0ad 100644 --- a/drivers/soc/mediatek/mtk-mmsys.c +++ b/drivers/soc/mediatek/mtk-mmsys.c @@ -58,6 +58,7 @@ static const struct mtk_mmsys_driver_data mt8183_mmsys_driver_data = { .num_routes = ARRAY_SIZE(mmsys_mt8183_routing_table), .mdp_routes = mmsys_mt8183_mdp_routing_table, .mdp_num_routes = ARRAY_SIZE(mmsys_mt8183_mdp_routing_table), + .mdp_isp_ctrl = mmsys_mt8183_mdp_isp_ctrl_table, }; static const struct mtk_mmsys_driver_data mt8192_mmsys_driver_data = { @@ -157,6 +158,122 @@ void mtk_mmsys_mdp_disconnect(struct device *dev, struct mmsys_cmdq_cmd *cmd, } EXPORT_SYMBOL_GPL(mtk_mmsys_mdp_disconnect); +void mtk_mmsys_mdp_isp_ctrl(struct device *dev, struct mmsys_cmdq_cmd *cmd, + enum mtk_mdp_comp_id id) +{ + struct mtk_mmsys *mmsys = dev_get_drvdata(dev); + const unsigned int *isp_ctrl = mmsys->data->mdp_isp_ctrl; + u32 reg; + + WARN_ON(mmsys->subsys_id == 0); + /* Direct link */ + if (id == MDP_COMP_CAMIN) { + /* Reset MDP_DL_ASYNC_TX */ + if (isp_ctrl[ISP_REG_MMSYS_SW0_RST_B]) { + reg = mmsys->addr + isp_ctrl[ISP_REG_MMSYS_SW0_RST_B]; + cmdq_pkt_write_mask(cmd->pkt, mmsys->subsys_id, reg, + 0x0, + isp_ctrl[ISP_BIT_MDP_DL_ASYNC_TX]); + cmdq_pkt_write_mask(cmd->pkt, mmsys->subsys_id, reg, + isp_ctrl[ISP_BIT_MDP_DL_ASYNC_TX], + isp_ctrl[ISP_BIT_MDP_DL_ASYNC_TX]); + } + + /* Reset MDP_DL_ASYNC_RX */ + if (isp_ctrl[ISP_REG_MMSYS_SW1_RST_B]) { + reg = mmsys->addr + isp_ctrl[ISP_REG_MMSYS_SW1_RST_B]; + cmdq_pkt_write_mask(cmd->pkt, mmsys->subsys_id, reg, + 0x0, + isp_ctrl[ISP_BIT_MDP_DL_ASYNC_RX]); + cmdq_pkt_write_mask(cmd->pkt, mmsys->subsys_id, reg, + isp_ctrl[ISP_BIT_MDP_DL_ASYNC_RX], + isp_ctrl[ISP_BIT_MDP_DL_ASYNC_RX]); + } + + /* Enable sof mode */ + if (isp_ctrl[ISP_REG_ISP_RELAY_CFG_WD]) { + reg = mmsys->addr + isp_ctrl[ISP_REG_ISP_RELAY_CFG_WD]; + cmdq_pkt_write_mask(cmd->pkt, mmsys->subsys_id, reg, + 0x0, + isp_ctrl[ISP_BIT_NO_SOF_MODE]); + } + } + + if (id == MDP_COMP_CAMIN2) { + /* Reset MDP_DL_ASYNC2_TX */ + if (isp_ctrl[ISP_REG_MMSYS_SW0_RST_B]) { + reg = mmsys->addr + isp_ctrl[ISP_REG_MMSYS_SW0_RST_B]; + cmdq_pkt_write_mask(cmd->pkt, mmsys->subsys_id, reg, + 0x0, + isp_ctrl[ISP_BIT_MDP_DL_ASYNC_TX2]); + cmdq_pkt_write_mask(cmd->pkt, mmsys->subsys_id, reg, + isp_ctrl[ISP_BIT_MDP_DL_ASYNC_TX2], + isp_ctrl[ISP_BIT_MDP_DL_ASYNC_TX2]); + } + + /* Reset MDP_DL_ASYNC2_RX */ + if (isp_ctrl[ISP_REG_MMSYS_SW1_RST_B]) { + reg = mmsys->addr + isp_ctrl[ISP_REG_MMSYS_SW1_RST_B]; + cmdq_pkt_write_mask(cmd->pkt, mmsys->subsys_id, reg, + 0x0, + isp_ctrl[ISP_BIT_MDP_DL_ASYNC_RX2]); + cmdq_pkt_write_mask(cmd->pkt, mmsys->subsys_id, reg, + isp_ctrl[ISP_BIT_MDP_DL_ASYNC_RX2], + isp_ctrl[ISP_BIT_MDP_DL_ASYNC_RX2]); + } + + /* Enable sof mode */ + if (isp_ctrl[ISP_REG_IPU_RELAY_CFG_WD]) { + reg = mmsys->addr + isp_ctrl[ISP_REG_IPU_RELAY_CFG_WD]; + cmdq_pkt_write_mask(cmd->pkt, mmsys->subsys_id, reg, + 0x0, + isp_ctrl[ISP_BIT_NO_SOF_MODE]); + } + } +} +EXPORT_SYMBOL_GPL(mtk_mmsys_mdp_isp_ctrl); + +void mtk_mmsys_mdp_camin_ctrl(struct device *dev, struct mmsys_cmdq_cmd *cmd, + enum mtk_mdp_comp_id id, u32 camin_w, u32 camin_h) +{ + struct mtk_mmsys *mmsys = dev_get_drvdata(dev); + const unsigned int *isp_ctrl = mmsys->data->mdp_isp_ctrl; + u32 reg; + + WARN_ON(mmsys->subsys_id == 0); + /* Config for direct link */ + if (id == MDP_COMP_CAMIN) { + if (isp_ctrl[ISP_REG_MDP_ASYNC_CFG_WD]) { + reg = mmsys->addr + isp_ctrl[ISP_REG_MDP_ASYNC_CFG_WD]; + cmdq_pkt_write_mask(cmd->pkt, mmsys->subsys_id, reg, + (camin_h << 16) + camin_w, + 0x3FFF3FFF); + } + + if (isp_ctrl[ISP_REG_ISP_RELAY_CFG_WD]) { + reg = mmsys->addr + isp_ctrl[ISP_REG_ISP_RELAY_CFG_WD]; + cmdq_pkt_write_mask(cmd->pkt, mmsys->subsys_id, reg, + (camin_h << 16) + camin_w, + 0x3FFF3FFF); + } + } + if (id == MDP_COMP_CAMIN2) { + if (isp_ctrl[ISP_REG_MDP_ASYNC_IPU_CFG_WD]) { + reg = mmsys->addr + isp_ctrl[ISP_REG_MDP_ASYNC_IPU_CFG_WD]; + cmdq_pkt_write_mask(cmd->pkt, mmsys->subsys_id, reg, + (camin_h << 16) + camin_w, + 0x3FFF3FFF); + } + if (isp_ctrl[ISP_REG_IPU_RELAY_CFG_WD]) { + reg = mmsys->addr + isp_ctrl[ISP_REG_IPU_RELAY_CFG_WD]; + cmdq_pkt_write_mask(cmd->pkt, mmsys->subsys_id, reg, + (camin_h << 16) + camin_w, + 0x3FFF3FFF); + } + } +} +EXPORT_SYMBOL_GPL(mtk_mmsys_mdp_camin_ctrl); + static int mtk_mmsys_reset_update(struct reset_controller_dev *rcdev, unsigned long id, bool assert) { diff --git a/drivers/soc/mediatek/mtk-mmsys.h b/drivers/soc/mediatek/mtk-mmsys.h index 7ec2107b9823..61baec9409de 100644 --- a/drivers/soc/mediatek/mtk-mmsys.h +++ b/drivers/soc/mediatek/mtk-mmsys.h @@ -94,6 +94,7 @@ struct mtk_mmsys_driver_data { const unsigned int num_routes; const struct mtk_mmsys_routes *mdp_routes; const unsigned int mdp_num_routes; + const unsigned int *mdp_isp_ctrl; }; /* diff --git a/include/linux/soc/mediatek/mtk-mmsys.h b/include/linux/soc/mediatek/mtk-mmsys.h index c5a4d6b181ce..1938428369f2 100644 --- a/include/linux/soc/mediatek/mtk-mmsys.h +++ b/include/linux/soc/mediatek/mtk-mmsys.h @@ -91,6 +91,29 @@ enum mtk_mdp_comp_id { MDP_MAX_COMP_COUNT /* ALWAYS keep at the end */ }; +enum mtk_mdp_pipe_id { + MDP_PIPE_RDMA0, + MDP_PIPE_IMGI, + MDP_PIPE_WPEI, + MDP_PIPE_WPEI2, + MDP_PIPE_MAX +}; + +enum mtk_isp_ctrl { + ISP_REG_MMSYS_SW0_RST_B, + ISP_REG_MMSYS_SW1_RST_B, + ISP_REG_MDP_ASYNC_CFG_WD, + ISP_REG_MDP_ASYNC_IPU_CFG_WD, + ISP_REG_ISP_RELAY_CFG_WD, + ISP_REG_IPU_RELAY_CFG_WD, + ISP_BIT_MDP_DL_ASYNC_TX, + ISP_BIT_MDP_DL_ASYNC_TX2, + ISP_BIT_MDP_DL_ASYNC_RX, + ISP_BIT_MDP_DL_ASYNC_RX2, + ISP_BIT_NO_SOF_MODE, + ISP_CTRL_MAX +}; + void mtk_mmsys_ddp_connect(struct device *dev, enum mtk_ddp_comp_id cur, enum mtk_ddp_comp_id next); @@ -109,4 +132,11 @@ void mtk_mmsys_mdp_disconnect(struct device *dev, enum mtk_mdp_comp_id cur, enum mtk_mdp_comp_id next); +void mtk_mmsys_mdp_isp_ctrl(struct device *dev, struct mmsys_cmdq_cmd *cmd, + enum mtk_mdp_comp_id id); + +void mtk_mmsys_mdp_camin_ctrl(struct device *dev, struct mmsys_cmdq_cmd *cmd, + enum mtk_mdp_comp_id id, + u32 camin_w, u32 camin_h); + #endif /* __MTK_MMSYS_H */ -- 2.18.0 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 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 7F453C433F5 for ; Thu, 2 Dec 2021 06:13:47 +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=c7mvKtFa6n/5JU+IAY9flFdP79BGKn7Wbmu7RvXsFLw=; b=2cH3mpZGQp0Ft5 xuvDjBWNTi9H/gMgG/0Apu9uzaIttXZd8CxYn5IHbMy9/djMcF4pjyl+j5zrJGkuITJneGRELyMqq SJ/3vy4mEDYkfRMvl4CA7QuKdcSKsDgOAJqqK+RPeKxGoLa4nUcE84svhpHULc539JP8odQsB8nju DwUkWuQvaqkT8+YDegEkezhWOfD0KDSgfLQDpuxMG4TkZRfKjP+lWNPBYCuGmJFu3Rl5e0W/OjWKN jYof0Lj2tpJYiquDEreR4wstt5zshfSvE2CyIU90jgz65c5Z4u9ZwFdTPRRyKHiO9xHqSpfmQQUzP 7bQMjYzf4iZda/Pl+KOw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1msfLc-00B1ih-Oo; Thu, 02 Dec 2021 06:13:36 +0000 Received: from mailgw02.mediatek.com ([216.200.240.185]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1msfLY-00B1fS-Hf; Thu, 02 Dec 2021 06:13:34 +0000 X-UUID: 4743cea34399478889ed284320bd0955-20211201 X-UUID: 4743cea34399478889ed284320bd0955-20211201 Received: from mtkcas68.mediatek.inc [(172.29.94.19)] by mailgw02.mediatek.com (envelope-from ) (musrelay.mediatek.com ESMTP with TLSv1.2 ECDHE-RSA-AES256-SHA384 256/256) with ESMTP id 2064400998; Wed, 01 Dec 2021 23:13:28 -0700 Received: from mtkmbs07n1.mediatek.inc (172.21.101.16) by MTKMBS62DR.mediatek.inc (172.29.94.18) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Wed, 1 Dec 2021 22:13:27 -0800 Received: from mtkcas10.mediatek.inc (172.21.101.39) by mtkmbs07n1.mediatek.inc (172.21.101.16) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Thu, 2 Dec 2021 14:13:25 +0800 Received: from mtksdccf07.mediatek.inc (172.21.84.99) by mtkcas10.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Thu, 2 Dec 2021 14:13:24 +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 v10 2/4] soc: mediatek: mmsys: add support for ISP control Date: Thu, 2 Dec 2021 14:13:20 +0800 Message-ID: <20211202061322.19917-3-moudy.ho@mediatek.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20211202061322.19917-1-moudy.ho@mediatek.com> References: <20211202061322.19917-1-moudy.ho@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-20211201_221332_653533_2E3E8934 X-CRM114-Status: GOOD ( 16.45 ) 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 This patch adds 8183 ISP settings in MMSYS domain and interface. Signed-off-by: Moudy Ho --- drivers/soc/mediatek/mt8183-mmsys.h | 26 ++++++ drivers/soc/mediatek/mtk-mmsys.c | 117 +++++++++++++++++++++++++ drivers/soc/mediatek/mtk-mmsys.h | 1 + include/linux/soc/mediatek/mtk-mmsys.h | 30 +++++++ 4 files changed, 174 insertions(+) diff --git a/drivers/soc/mediatek/mt8183-mmsys.h b/drivers/soc/mediatek/mt8183-mmsys.h index 48865973314d..afc98c4dac95 100644 --- a/drivers/soc/mediatek/mt8183-mmsys.h +++ b/drivers/soc/mediatek/mt8183-mmsys.h @@ -32,6 +32,18 @@ #define MT8183_MDP_CCORR_SEL_IN 0xff0 #define MT8183_MDP_CCORR_SOUT_SEL 0xff4 +#define MT8183_ISP_REG_MMSYS_SW0_RST_B 0x140 +#define MT8183_ISP_REG_MMSYS_SW1_RST_B 0x144 +#define MT8183_ISP_REG_MDP_ASYNC_CFG_WD 0x934 +#define MT8183_ISP_REG_MDP_ASYNC_IPU_CFG_WD 0x93C +#define MT8183_ISP_REG_ISP_RELAY_CFG_WD 0x994 +#define MT8183_ISP_REG_IPU_RELAY_CFG_WD 0x9a0 +#define MT8183_ISP_BIT_MDP_DL_ASYNC_TX BIT(3) +#define MT8183_ISP_BIT_MDP_DL_ASYNC_TX2 BIT(4) +#define MT8183_ISP_BIT_MDP_DL_ASYNC_RX BIT(10) +#define MT8183_ISP_BIT_MDP_DL_ASYNC_RX2 BIT(11) +#define MT8183_ISP_BIT_NO_SOF_MODE BIT(31) + #define MT8183_OVL0_MOUT_EN_OVL0_2L BIT(4) #define MT8183_OVL0_2L_MOUT_EN_DISP_PATH0 BIT(0) #define MT8183_OVL1_2L_MOUT_EN_RDMA1 BIT(4) @@ -325,5 +337,19 @@ static const struct mtk_mmsys_routes mmsys_mt8183_mdp_routing_table[] = { } }; +static const unsigned int mmsys_mt8183_mdp_isp_ctrl_table[ISP_CTRL_MAX] = { + [ISP_REG_MMSYS_SW0_RST_B] = MT8183_ISP_REG_MMSYS_SW0_RST_B, + [ISP_REG_MMSYS_SW1_RST_B] = MT8183_ISP_REG_MMSYS_SW1_RST_B, + [ISP_REG_MDP_ASYNC_CFG_WD] = MT8183_ISP_REG_MDP_ASYNC_CFG_WD, + [ISP_REG_MDP_ASYNC_IPU_CFG_WD] = MT8183_ISP_REG_MDP_ASYNC_IPU_CFG_WD, + [ISP_REG_ISP_RELAY_CFG_WD] = MT8183_ISP_REG_ISP_RELAY_CFG_WD, + [ISP_REG_IPU_RELAY_CFG_WD] = MT8183_ISP_REG_IPU_RELAY_CFG_WD, + [ISP_BIT_MDP_DL_ASYNC_TX] = MT8183_ISP_BIT_MDP_DL_ASYNC_TX, + [ISP_BIT_MDP_DL_ASYNC_TX2] = MT8183_ISP_BIT_MDP_DL_ASYNC_TX2, + [ISP_BIT_MDP_DL_ASYNC_RX] = MT8183_ISP_BIT_MDP_DL_ASYNC_RX, + [ISP_BIT_MDP_DL_ASYNC_RX2] = MT8183_ISP_BIT_MDP_DL_ASYNC_RX2, + [ISP_BIT_NO_SOF_MODE] = MT8183_ISP_BIT_NO_SOF_MODE, +}; + #endif /* __SOC_MEDIATEK_MT8183_MMSYS_H */ diff --git a/drivers/soc/mediatek/mtk-mmsys.c b/drivers/soc/mediatek/mtk-mmsys.c index 905847d6e16c..cfbf36e6e0ad 100644 --- a/drivers/soc/mediatek/mtk-mmsys.c +++ b/drivers/soc/mediatek/mtk-mmsys.c @@ -58,6 +58,7 @@ static const struct mtk_mmsys_driver_data mt8183_mmsys_driver_data = { .num_routes = ARRAY_SIZE(mmsys_mt8183_routing_table), .mdp_routes = mmsys_mt8183_mdp_routing_table, .mdp_num_routes = ARRAY_SIZE(mmsys_mt8183_mdp_routing_table), + .mdp_isp_ctrl = mmsys_mt8183_mdp_isp_ctrl_table, }; static const struct mtk_mmsys_driver_data mt8192_mmsys_driver_data = { @@ -157,6 +158,122 @@ void mtk_mmsys_mdp_disconnect(struct device *dev, struct mmsys_cmdq_cmd *cmd, } EXPORT_SYMBOL_GPL(mtk_mmsys_mdp_disconnect); +void mtk_mmsys_mdp_isp_ctrl(struct device *dev, struct mmsys_cmdq_cmd *cmd, + enum mtk_mdp_comp_id id) +{ + struct mtk_mmsys *mmsys = dev_get_drvdata(dev); + const unsigned int *isp_ctrl = mmsys->data->mdp_isp_ctrl; + u32 reg; + + WARN_ON(mmsys->subsys_id == 0); + /* Direct link */ + if (id == MDP_COMP_CAMIN) { + /* Reset MDP_DL_ASYNC_TX */ + if (isp_ctrl[ISP_REG_MMSYS_SW0_RST_B]) { + reg = mmsys->addr + isp_ctrl[ISP_REG_MMSYS_SW0_RST_B]; + cmdq_pkt_write_mask(cmd->pkt, mmsys->subsys_id, reg, + 0x0, + isp_ctrl[ISP_BIT_MDP_DL_ASYNC_TX]); + cmdq_pkt_write_mask(cmd->pkt, mmsys->subsys_id, reg, + isp_ctrl[ISP_BIT_MDP_DL_ASYNC_TX], + isp_ctrl[ISP_BIT_MDP_DL_ASYNC_TX]); + } + + /* Reset MDP_DL_ASYNC_RX */ + if (isp_ctrl[ISP_REG_MMSYS_SW1_RST_B]) { + reg = mmsys->addr + isp_ctrl[ISP_REG_MMSYS_SW1_RST_B]; + cmdq_pkt_write_mask(cmd->pkt, mmsys->subsys_id, reg, + 0x0, + isp_ctrl[ISP_BIT_MDP_DL_ASYNC_RX]); + cmdq_pkt_write_mask(cmd->pkt, mmsys->subsys_id, reg, + isp_ctrl[ISP_BIT_MDP_DL_ASYNC_RX], + isp_ctrl[ISP_BIT_MDP_DL_ASYNC_RX]); + } + + /* Enable sof mode */ + if (isp_ctrl[ISP_REG_ISP_RELAY_CFG_WD]) { + reg = mmsys->addr + isp_ctrl[ISP_REG_ISP_RELAY_CFG_WD]; + cmdq_pkt_write_mask(cmd->pkt, mmsys->subsys_id, reg, + 0x0, + isp_ctrl[ISP_BIT_NO_SOF_MODE]); + } + } + + if (id == MDP_COMP_CAMIN2) { + /* Reset MDP_DL_ASYNC2_TX */ + if (isp_ctrl[ISP_REG_MMSYS_SW0_RST_B]) { + reg = mmsys->addr + isp_ctrl[ISP_REG_MMSYS_SW0_RST_B]; + cmdq_pkt_write_mask(cmd->pkt, mmsys->subsys_id, reg, + 0x0, + isp_ctrl[ISP_BIT_MDP_DL_ASYNC_TX2]); + cmdq_pkt_write_mask(cmd->pkt, mmsys->subsys_id, reg, + isp_ctrl[ISP_BIT_MDP_DL_ASYNC_TX2], + isp_ctrl[ISP_BIT_MDP_DL_ASYNC_TX2]); + } + + /* Reset MDP_DL_ASYNC2_RX */ + if (isp_ctrl[ISP_REG_MMSYS_SW1_RST_B]) { + reg = mmsys->addr + isp_ctrl[ISP_REG_MMSYS_SW1_RST_B]; + cmdq_pkt_write_mask(cmd->pkt, mmsys->subsys_id, reg, + 0x0, + isp_ctrl[ISP_BIT_MDP_DL_ASYNC_RX2]); + cmdq_pkt_write_mask(cmd->pkt, mmsys->subsys_id, reg, + isp_ctrl[ISP_BIT_MDP_DL_ASYNC_RX2], + isp_ctrl[ISP_BIT_MDP_DL_ASYNC_RX2]); + } + + /* Enable sof mode */ + if (isp_ctrl[ISP_REG_IPU_RELAY_CFG_WD]) { + reg = mmsys->addr + isp_ctrl[ISP_REG_IPU_RELAY_CFG_WD]; + cmdq_pkt_write_mask(cmd->pkt, mmsys->subsys_id, reg, + 0x0, + isp_ctrl[ISP_BIT_NO_SOF_MODE]); + } + } +} +EXPORT_SYMBOL_GPL(mtk_mmsys_mdp_isp_ctrl); + +void mtk_mmsys_mdp_camin_ctrl(struct device *dev, struct mmsys_cmdq_cmd *cmd, + enum mtk_mdp_comp_id id, u32 camin_w, u32 camin_h) +{ + struct mtk_mmsys *mmsys = dev_get_drvdata(dev); + const unsigned int *isp_ctrl = mmsys->data->mdp_isp_ctrl; + u32 reg; + + WARN_ON(mmsys->subsys_id == 0); + /* Config for direct link */ + if (id == MDP_COMP_CAMIN) { + if (isp_ctrl[ISP_REG_MDP_ASYNC_CFG_WD]) { + reg = mmsys->addr + isp_ctrl[ISP_REG_MDP_ASYNC_CFG_WD]; + cmdq_pkt_write_mask(cmd->pkt, mmsys->subsys_id, reg, + (camin_h << 16) + camin_w, + 0x3FFF3FFF); + } + + if (isp_ctrl[ISP_REG_ISP_RELAY_CFG_WD]) { + reg = mmsys->addr + isp_ctrl[ISP_REG_ISP_RELAY_CFG_WD]; + cmdq_pkt_write_mask(cmd->pkt, mmsys->subsys_id, reg, + (camin_h << 16) + camin_w, + 0x3FFF3FFF); + } + } + if (id == MDP_COMP_CAMIN2) { + if (isp_ctrl[ISP_REG_MDP_ASYNC_IPU_CFG_WD]) { + reg = mmsys->addr + isp_ctrl[ISP_REG_MDP_ASYNC_IPU_CFG_WD]; + cmdq_pkt_write_mask(cmd->pkt, mmsys->subsys_id, reg, + (camin_h << 16) + camin_w, + 0x3FFF3FFF); + } + if (isp_ctrl[ISP_REG_IPU_RELAY_CFG_WD]) { + reg = mmsys->addr + isp_ctrl[ISP_REG_IPU_RELAY_CFG_WD]; + cmdq_pkt_write_mask(cmd->pkt, mmsys->subsys_id, reg, + (camin_h << 16) + camin_w, + 0x3FFF3FFF); + } + } +} +EXPORT_SYMBOL_GPL(mtk_mmsys_mdp_camin_ctrl); + static int mtk_mmsys_reset_update(struct reset_controller_dev *rcdev, unsigned long id, bool assert) { diff --git a/drivers/soc/mediatek/mtk-mmsys.h b/drivers/soc/mediatek/mtk-mmsys.h index 7ec2107b9823..61baec9409de 100644 --- a/drivers/soc/mediatek/mtk-mmsys.h +++ b/drivers/soc/mediatek/mtk-mmsys.h @@ -94,6 +94,7 @@ struct mtk_mmsys_driver_data { const unsigned int num_routes; const struct mtk_mmsys_routes *mdp_routes; const unsigned int mdp_num_routes; + const unsigned int *mdp_isp_ctrl; }; /* diff --git a/include/linux/soc/mediatek/mtk-mmsys.h b/include/linux/soc/mediatek/mtk-mmsys.h index c5a4d6b181ce..1938428369f2 100644 --- a/include/linux/soc/mediatek/mtk-mmsys.h +++ b/include/linux/soc/mediatek/mtk-mmsys.h @@ -91,6 +91,29 @@ enum mtk_mdp_comp_id { MDP_MAX_COMP_COUNT /* ALWAYS keep at the end */ }; +enum mtk_mdp_pipe_id { + MDP_PIPE_RDMA0, + MDP_PIPE_IMGI, + MDP_PIPE_WPEI, + MDP_PIPE_WPEI2, + MDP_PIPE_MAX +}; + +enum mtk_isp_ctrl { + ISP_REG_MMSYS_SW0_RST_B, + ISP_REG_MMSYS_SW1_RST_B, + ISP_REG_MDP_ASYNC_CFG_WD, + ISP_REG_MDP_ASYNC_IPU_CFG_WD, + ISP_REG_ISP_RELAY_CFG_WD, + ISP_REG_IPU_RELAY_CFG_WD, + ISP_BIT_MDP_DL_ASYNC_TX, + ISP_BIT_MDP_DL_ASYNC_TX2, + ISP_BIT_MDP_DL_ASYNC_RX, + ISP_BIT_MDP_DL_ASYNC_RX2, + ISP_BIT_NO_SOF_MODE, + ISP_CTRL_MAX +}; + void mtk_mmsys_ddp_connect(struct device *dev, enum mtk_ddp_comp_id cur, enum mtk_ddp_comp_id next); @@ -109,4 +132,11 @@ void mtk_mmsys_mdp_disconnect(struct device *dev, enum mtk_mdp_comp_id cur, enum mtk_mdp_comp_id next); +void mtk_mmsys_mdp_isp_ctrl(struct device *dev, struct mmsys_cmdq_cmd *cmd, + enum mtk_mdp_comp_id id); + +void mtk_mmsys_mdp_camin_ctrl(struct device *dev, struct mmsys_cmdq_cmd *cmd, + enum mtk_mdp_comp_id id, + u32 camin_w, u32 camin_h); + #endif /* __MTK_MMSYS_H */ -- 2.18.0 _______________________________________________ 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 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 B4245C433F5 for ; Thu, 2 Dec 2021 06:15:18 +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=oHFTHRRAW0TpU2o6JkRydLaiICwOOV193UACAMKjdu0=; b=RvAtuFbzCp9rDJ zDVXbpxDxWCLjEFufy3qMpTqmRyCV2/Nq/kiN1OQdbE3Qg1HRi2pzgihgiG936CSZDzRc1h5ZQtqL IZ7s2k7RRDrR8hOcqkrHSRO6hRGoBO/Z364a0taitGx/lDDKmvR4jXLU65moifX5zxykpwP5dRX8z pdWDxWAk8vRQTIlctY6fgdnjWDw8Ymeb9vzQvd8ADSZ19kslscabmrHC5nDN7SFTU5FqYm3wXwvc/ oUKxGKVDPqj5hbikgUyuvEY++gBBj59F5pZnWXn+LIdGxoKpJIhjqdEETgPma62O7JnwLAlDFLGWt rgpBO6Fpv//7w2hiTkqQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1msfLg-00B1ke-L6; Thu, 02 Dec 2021 06:13:40 +0000 Received: from mailgw02.mediatek.com ([216.200.240.185]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1msfLY-00B1fS-Hf; Thu, 02 Dec 2021 06:13:34 +0000 X-UUID: 4743cea34399478889ed284320bd0955-20211201 X-UUID: 4743cea34399478889ed284320bd0955-20211201 Received: from mtkcas68.mediatek.inc [(172.29.94.19)] by mailgw02.mediatek.com (envelope-from ) (musrelay.mediatek.com ESMTP with TLSv1.2 ECDHE-RSA-AES256-SHA384 256/256) with ESMTP id 2064400998; Wed, 01 Dec 2021 23:13:28 -0700 Received: from mtkmbs07n1.mediatek.inc (172.21.101.16) by MTKMBS62DR.mediatek.inc (172.29.94.18) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Wed, 1 Dec 2021 22:13:27 -0800 Received: from mtkcas10.mediatek.inc (172.21.101.39) by mtkmbs07n1.mediatek.inc (172.21.101.16) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Thu, 2 Dec 2021 14:13:25 +0800 Received: from mtksdccf07.mediatek.inc (172.21.84.99) by mtkcas10.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Thu, 2 Dec 2021 14:13:24 +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 v10 2/4] soc: mediatek: mmsys: add support for ISP control Date: Thu, 2 Dec 2021 14:13:20 +0800 Message-ID: <20211202061322.19917-3-moudy.ho@mediatek.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20211202061322.19917-1-moudy.ho@mediatek.com> References: <20211202061322.19917-1-moudy.ho@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-20211201_221332_653533_2E3E8934 X-CRM114-Status: GOOD ( 16.45 ) 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 This patch adds 8183 ISP settings in MMSYS domain and interface. Signed-off-by: Moudy Ho --- drivers/soc/mediatek/mt8183-mmsys.h | 26 ++++++ drivers/soc/mediatek/mtk-mmsys.c | 117 +++++++++++++++++++++++++ drivers/soc/mediatek/mtk-mmsys.h | 1 + include/linux/soc/mediatek/mtk-mmsys.h | 30 +++++++ 4 files changed, 174 insertions(+) diff --git a/drivers/soc/mediatek/mt8183-mmsys.h b/drivers/soc/mediatek/mt8183-mmsys.h index 48865973314d..afc98c4dac95 100644 --- a/drivers/soc/mediatek/mt8183-mmsys.h +++ b/drivers/soc/mediatek/mt8183-mmsys.h @@ -32,6 +32,18 @@ #define MT8183_MDP_CCORR_SEL_IN 0xff0 #define MT8183_MDP_CCORR_SOUT_SEL 0xff4 +#define MT8183_ISP_REG_MMSYS_SW0_RST_B 0x140 +#define MT8183_ISP_REG_MMSYS_SW1_RST_B 0x144 +#define MT8183_ISP_REG_MDP_ASYNC_CFG_WD 0x934 +#define MT8183_ISP_REG_MDP_ASYNC_IPU_CFG_WD 0x93C +#define MT8183_ISP_REG_ISP_RELAY_CFG_WD 0x994 +#define MT8183_ISP_REG_IPU_RELAY_CFG_WD 0x9a0 +#define MT8183_ISP_BIT_MDP_DL_ASYNC_TX BIT(3) +#define MT8183_ISP_BIT_MDP_DL_ASYNC_TX2 BIT(4) +#define MT8183_ISP_BIT_MDP_DL_ASYNC_RX BIT(10) +#define MT8183_ISP_BIT_MDP_DL_ASYNC_RX2 BIT(11) +#define MT8183_ISP_BIT_NO_SOF_MODE BIT(31) + #define MT8183_OVL0_MOUT_EN_OVL0_2L BIT(4) #define MT8183_OVL0_2L_MOUT_EN_DISP_PATH0 BIT(0) #define MT8183_OVL1_2L_MOUT_EN_RDMA1 BIT(4) @@ -325,5 +337,19 @@ static const struct mtk_mmsys_routes mmsys_mt8183_mdp_routing_table[] = { } }; +static const unsigned int mmsys_mt8183_mdp_isp_ctrl_table[ISP_CTRL_MAX] = { + [ISP_REG_MMSYS_SW0_RST_B] = MT8183_ISP_REG_MMSYS_SW0_RST_B, + [ISP_REG_MMSYS_SW1_RST_B] = MT8183_ISP_REG_MMSYS_SW1_RST_B, + [ISP_REG_MDP_ASYNC_CFG_WD] = MT8183_ISP_REG_MDP_ASYNC_CFG_WD, + [ISP_REG_MDP_ASYNC_IPU_CFG_WD] = MT8183_ISP_REG_MDP_ASYNC_IPU_CFG_WD, + [ISP_REG_ISP_RELAY_CFG_WD] = MT8183_ISP_REG_ISP_RELAY_CFG_WD, + [ISP_REG_IPU_RELAY_CFG_WD] = MT8183_ISP_REG_IPU_RELAY_CFG_WD, + [ISP_BIT_MDP_DL_ASYNC_TX] = MT8183_ISP_BIT_MDP_DL_ASYNC_TX, + [ISP_BIT_MDP_DL_ASYNC_TX2] = MT8183_ISP_BIT_MDP_DL_ASYNC_TX2, + [ISP_BIT_MDP_DL_ASYNC_RX] = MT8183_ISP_BIT_MDP_DL_ASYNC_RX, + [ISP_BIT_MDP_DL_ASYNC_RX2] = MT8183_ISP_BIT_MDP_DL_ASYNC_RX2, + [ISP_BIT_NO_SOF_MODE] = MT8183_ISP_BIT_NO_SOF_MODE, +}; + #endif /* __SOC_MEDIATEK_MT8183_MMSYS_H */ diff --git a/drivers/soc/mediatek/mtk-mmsys.c b/drivers/soc/mediatek/mtk-mmsys.c index 905847d6e16c..cfbf36e6e0ad 100644 --- a/drivers/soc/mediatek/mtk-mmsys.c +++ b/drivers/soc/mediatek/mtk-mmsys.c @@ -58,6 +58,7 @@ static const struct mtk_mmsys_driver_data mt8183_mmsys_driver_data = { .num_routes = ARRAY_SIZE(mmsys_mt8183_routing_table), .mdp_routes = mmsys_mt8183_mdp_routing_table, .mdp_num_routes = ARRAY_SIZE(mmsys_mt8183_mdp_routing_table), + .mdp_isp_ctrl = mmsys_mt8183_mdp_isp_ctrl_table, }; static const struct mtk_mmsys_driver_data mt8192_mmsys_driver_data = { @@ -157,6 +158,122 @@ void mtk_mmsys_mdp_disconnect(struct device *dev, struct mmsys_cmdq_cmd *cmd, } EXPORT_SYMBOL_GPL(mtk_mmsys_mdp_disconnect); +void mtk_mmsys_mdp_isp_ctrl(struct device *dev, struct mmsys_cmdq_cmd *cmd, + enum mtk_mdp_comp_id id) +{ + struct mtk_mmsys *mmsys = dev_get_drvdata(dev); + const unsigned int *isp_ctrl = mmsys->data->mdp_isp_ctrl; + u32 reg; + + WARN_ON(mmsys->subsys_id == 0); + /* Direct link */ + if (id == MDP_COMP_CAMIN) { + /* Reset MDP_DL_ASYNC_TX */ + if (isp_ctrl[ISP_REG_MMSYS_SW0_RST_B]) { + reg = mmsys->addr + isp_ctrl[ISP_REG_MMSYS_SW0_RST_B]; + cmdq_pkt_write_mask(cmd->pkt, mmsys->subsys_id, reg, + 0x0, + isp_ctrl[ISP_BIT_MDP_DL_ASYNC_TX]); + cmdq_pkt_write_mask(cmd->pkt, mmsys->subsys_id, reg, + isp_ctrl[ISP_BIT_MDP_DL_ASYNC_TX], + isp_ctrl[ISP_BIT_MDP_DL_ASYNC_TX]); + } + + /* Reset MDP_DL_ASYNC_RX */ + if (isp_ctrl[ISP_REG_MMSYS_SW1_RST_B]) { + reg = mmsys->addr + isp_ctrl[ISP_REG_MMSYS_SW1_RST_B]; + cmdq_pkt_write_mask(cmd->pkt, mmsys->subsys_id, reg, + 0x0, + isp_ctrl[ISP_BIT_MDP_DL_ASYNC_RX]); + cmdq_pkt_write_mask(cmd->pkt, mmsys->subsys_id, reg, + isp_ctrl[ISP_BIT_MDP_DL_ASYNC_RX], + isp_ctrl[ISP_BIT_MDP_DL_ASYNC_RX]); + } + + /* Enable sof mode */ + if (isp_ctrl[ISP_REG_ISP_RELAY_CFG_WD]) { + reg = mmsys->addr + isp_ctrl[ISP_REG_ISP_RELAY_CFG_WD]; + cmdq_pkt_write_mask(cmd->pkt, mmsys->subsys_id, reg, + 0x0, + isp_ctrl[ISP_BIT_NO_SOF_MODE]); + } + } + + if (id == MDP_COMP_CAMIN2) { + /* Reset MDP_DL_ASYNC2_TX */ + if (isp_ctrl[ISP_REG_MMSYS_SW0_RST_B]) { + reg = mmsys->addr + isp_ctrl[ISP_REG_MMSYS_SW0_RST_B]; + cmdq_pkt_write_mask(cmd->pkt, mmsys->subsys_id, reg, + 0x0, + isp_ctrl[ISP_BIT_MDP_DL_ASYNC_TX2]); + cmdq_pkt_write_mask(cmd->pkt, mmsys->subsys_id, reg, + isp_ctrl[ISP_BIT_MDP_DL_ASYNC_TX2], + isp_ctrl[ISP_BIT_MDP_DL_ASYNC_TX2]); + } + + /* Reset MDP_DL_ASYNC2_RX */ + if (isp_ctrl[ISP_REG_MMSYS_SW1_RST_B]) { + reg = mmsys->addr + isp_ctrl[ISP_REG_MMSYS_SW1_RST_B]; + cmdq_pkt_write_mask(cmd->pkt, mmsys->subsys_id, reg, + 0x0, + isp_ctrl[ISP_BIT_MDP_DL_ASYNC_RX2]); + cmdq_pkt_write_mask(cmd->pkt, mmsys->subsys_id, reg, + isp_ctrl[ISP_BIT_MDP_DL_ASYNC_RX2], + isp_ctrl[ISP_BIT_MDP_DL_ASYNC_RX2]); + } + + /* Enable sof mode */ + if (isp_ctrl[ISP_REG_IPU_RELAY_CFG_WD]) { + reg = mmsys->addr + isp_ctrl[ISP_REG_IPU_RELAY_CFG_WD]; + cmdq_pkt_write_mask(cmd->pkt, mmsys->subsys_id, reg, + 0x0, + isp_ctrl[ISP_BIT_NO_SOF_MODE]); + } + } +} +EXPORT_SYMBOL_GPL(mtk_mmsys_mdp_isp_ctrl); + +void mtk_mmsys_mdp_camin_ctrl(struct device *dev, struct mmsys_cmdq_cmd *cmd, + enum mtk_mdp_comp_id id, u32 camin_w, u32 camin_h) +{ + struct mtk_mmsys *mmsys = dev_get_drvdata(dev); + const unsigned int *isp_ctrl = mmsys->data->mdp_isp_ctrl; + u32 reg; + + WARN_ON(mmsys->subsys_id == 0); + /* Config for direct link */ + if (id == MDP_COMP_CAMIN) { + if (isp_ctrl[ISP_REG_MDP_ASYNC_CFG_WD]) { + reg = mmsys->addr + isp_ctrl[ISP_REG_MDP_ASYNC_CFG_WD]; + cmdq_pkt_write_mask(cmd->pkt, mmsys->subsys_id, reg, + (camin_h << 16) + camin_w, + 0x3FFF3FFF); + } + + if (isp_ctrl[ISP_REG_ISP_RELAY_CFG_WD]) { + reg = mmsys->addr + isp_ctrl[ISP_REG_ISP_RELAY_CFG_WD]; + cmdq_pkt_write_mask(cmd->pkt, mmsys->subsys_id, reg, + (camin_h << 16) + camin_w, + 0x3FFF3FFF); + } + } + if (id == MDP_COMP_CAMIN2) { + if (isp_ctrl[ISP_REG_MDP_ASYNC_IPU_CFG_WD]) { + reg = mmsys->addr + isp_ctrl[ISP_REG_MDP_ASYNC_IPU_CFG_WD]; + cmdq_pkt_write_mask(cmd->pkt, mmsys->subsys_id, reg, + (camin_h << 16) + camin_w, + 0x3FFF3FFF); + } + if (isp_ctrl[ISP_REG_IPU_RELAY_CFG_WD]) { + reg = mmsys->addr + isp_ctrl[ISP_REG_IPU_RELAY_CFG_WD]; + cmdq_pkt_write_mask(cmd->pkt, mmsys->subsys_id, reg, + (camin_h << 16) + camin_w, + 0x3FFF3FFF); + } + } +} +EXPORT_SYMBOL_GPL(mtk_mmsys_mdp_camin_ctrl); + static int mtk_mmsys_reset_update(struct reset_controller_dev *rcdev, unsigned long id, bool assert) { diff --git a/drivers/soc/mediatek/mtk-mmsys.h b/drivers/soc/mediatek/mtk-mmsys.h index 7ec2107b9823..61baec9409de 100644 --- a/drivers/soc/mediatek/mtk-mmsys.h +++ b/drivers/soc/mediatek/mtk-mmsys.h @@ -94,6 +94,7 @@ struct mtk_mmsys_driver_data { const unsigned int num_routes; const struct mtk_mmsys_routes *mdp_routes; const unsigned int mdp_num_routes; + const unsigned int *mdp_isp_ctrl; }; /* diff --git a/include/linux/soc/mediatek/mtk-mmsys.h b/include/linux/soc/mediatek/mtk-mmsys.h index c5a4d6b181ce..1938428369f2 100644 --- a/include/linux/soc/mediatek/mtk-mmsys.h +++ b/include/linux/soc/mediatek/mtk-mmsys.h @@ -91,6 +91,29 @@ enum mtk_mdp_comp_id { MDP_MAX_COMP_COUNT /* ALWAYS keep at the end */ }; +enum mtk_mdp_pipe_id { + MDP_PIPE_RDMA0, + MDP_PIPE_IMGI, + MDP_PIPE_WPEI, + MDP_PIPE_WPEI2, + MDP_PIPE_MAX +}; + +enum mtk_isp_ctrl { + ISP_REG_MMSYS_SW0_RST_B, + ISP_REG_MMSYS_SW1_RST_B, + ISP_REG_MDP_ASYNC_CFG_WD, + ISP_REG_MDP_ASYNC_IPU_CFG_WD, + ISP_REG_ISP_RELAY_CFG_WD, + ISP_REG_IPU_RELAY_CFG_WD, + ISP_BIT_MDP_DL_ASYNC_TX, + ISP_BIT_MDP_DL_ASYNC_TX2, + ISP_BIT_MDP_DL_ASYNC_RX, + ISP_BIT_MDP_DL_ASYNC_RX2, + ISP_BIT_NO_SOF_MODE, + ISP_CTRL_MAX +}; + void mtk_mmsys_ddp_connect(struct device *dev, enum mtk_ddp_comp_id cur, enum mtk_ddp_comp_id next); @@ -109,4 +132,11 @@ void mtk_mmsys_mdp_disconnect(struct device *dev, enum mtk_mdp_comp_id cur, enum mtk_mdp_comp_id next); +void mtk_mmsys_mdp_isp_ctrl(struct device *dev, struct mmsys_cmdq_cmd *cmd, + enum mtk_mdp_comp_id id); + +void mtk_mmsys_mdp_camin_ctrl(struct device *dev, struct mmsys_cmdq_cmd *cmd, + enum mtk_mdp_comp_id id, + u32 camin_w, u32 camin_h); + #endif /* __MTK_MMSYS_H */ -- 2.18.0 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel