From: Nancy.Lin <nancy.lin@mediatek.com>
To: Rob Herring <robh+dt@kernel.org>,
Matthias Brugger <matthias.bgg@gmail.com>,
Chun-Kuang Hu <chunkuang.hu@kernel.org>,
Philipp Zabel <p.zabel@pengutronix.de>, <wim@linux-watchdog.org>,
AngeloGioacchino Del Regno
<angelogioacchino.delregno@collabora.com>, <linux@roeck-us.net>
Cc: devicetree@vger.kernel.org,
Project_Global_Chrome_Upstream_Group@mediatek.com,
Yongqiang Niu <yongqiang.niu@mediatek.com>,
srv_heupstream@mediatek.com, David Airlie <airlied@linux.ie>,
"jason-jh . lin" <jason-jh.lin@mediatek.com>,
singo.chang@mediatek.com, llvm@lists.linux.dev,
Nick Desaulniers <ndesaulniers@google.com>,
linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org,
Nathan Chancellor <nathan@kernel.org>,
"Nancy . Lin" <nancy.lin@mediatek.com>,
linux-mediatek@lists.infradead.org,
linux-arm-kernel@lists.infradead.org
Subject: [PATCH v17 12/21] drm/mediatek: add display merge mute/unmute support for MT8195
Date: Sat, 16 Apr 2022 10:07:40 +0800 [thread overview]
Message-ID: <20220416020749.29010-13-nancy.lin@mediatek.com> (raw)
In-Reply-To: <20220416020749.29010-1-nancy.lin@mediatek.com>
Add merge mute/unmute setting for MT8195.
MT8195 Vdosys1 merge1~merge4 support HW mute function.
Signed-off-by: Nancy.Lin <nancy.lin@mediatek.com>
Reviewed-by: Chun-Kuang Hu <chunkuang.hu@kernel.org>
Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
---
drivers/gpu/drm/mediatek/mtk_disp_merge.c | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/drivers/gpu/drm/mediatek/mtk_disp_merge.c b/drivers/gpu/drm/mediatek/mtk_disp_merge.c
index c0d9b43b2a66..9dca145cfb71 100644
--- a/drivers/gpu/drm/mediatek/mtk_disp_merge.c
+++ b/drivers/gpu/drm/mediatek/mtk_disp_merge.c
@@ -58,12 +58,15 @@
#define FLD_PREULTRA_TH_LOW GENMASK(15, 0)
#define FLD_PREULTRA_TH_HIGH GENMASK(31, 16)
+#define DISP_REG_MERGE_MUTE_0 0xf00
+
struct mtk_disp_merge {
void __iomem *regs;
struct clk *clk;
struct clk *async_clk;
struct cmdq_client_reg cmdq_reg;
bool fifo_en;
+ bool mute_support;
};
void mtk_merge_start(struct device *dev)
@@ -82,6 +85,10 @@ void mtk_merge_start_cmdq(struct device *dev, struct cmdq_pkt *cmdq_pkt)
{
struct mtk_disp_merge *priv = dev_get_drvdata(dev);
+ if (priv->mute_support)
+ mtk_ddp_write(cmdq_pkt, 0x0, &priv->cmdq_reg, priv->regs,
+ DISP_REG_MERGE_MUTE_0);
+
mtk_ddp_write(cmdq_pkt, 1, &priv->cmdq_reg, priv->regs,
DISP_REG_MERGE_CTRL);
}
@@ -90,6 +97,10 @@ void mtk_merge_stop_cmdq(struct device *dev, struct cmdq_pkt *cmdq_pkt)
{
struct mtk_disp_merge *priv = dev_get_drvdata(dev);
+ if (priv->mute_support)
+ mtk_ddp_write(cmdq_pkt, 0x1, &priv->cmdq_reg, priv->regs,
+ DISP_REG_MERGE_MUTE_0);
+
mtk_ddp_write(cmdq_pkt, 0, &priv->cmdq_reg, priv->regs,
DISP_REG_MERGE_CTRL);
}
@@ -264,6 +275,8 @@ static int mtk_disp_merge_probe(struct platform_device *pdev)
priv->fifo_en = of_property_read_bool(dev->of_node,
"mediatek,merge-fifo-en");
+ priv->mute_support = of_property_read_bool(dev->of_node,
+ "mediatek,merge-mute");
platform_set_drvdata(pdev, priv);
ret = component_add(dev, &mtk_disp_merge_component_ops);
--
2.18.0
next prev parent reply other threads:[~2022-04-16 2:08 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-16 2:07 [PATCH v17 00/21] Add MediaTek SoC DRM (vdosys1) support for mt8195 Nancy.Lin
2022-04-16 2:07 ` [PATCH v17 01/21] dt-bindings: mediatek: add vdosys1 RDMA definition " Nancy.Lin
2022-04-16 2:07 ` [PATCH v17 02/21] dt-bindings: reset: mt8195: add vdosys1 reset control bit Nancy.Lin
2022-04-16 2:07 ` [PATCH v17 03/21] dt-bindings: mediatek: add ethdr definition for mt8195 Nancy.Lin
2022-04-25 9:54 ` Philipp Zabel
2022-04-28 2:25 ` Nancy.Lin
2022-04-16 2:07 ` [PATCH v17 04/21] soc: mediatek: add mtk-mmsys support for mt8195 vdosys1 Nancy.Lin
2022-04-16 2:07 ` [PATCH v17 05/21] soc: mediatek: add mtk-mmsys config API " Nancy.Lin
2022-04-21 1:53 ` Rex-BC Chen
2022-04-16 2:07 ` [PATCH v17 06/21] soc: mediatek: add cmdq support of " Nancy.Lin
2022-04-21 1:55 ` Rex-BC Chen
2022-04-22 11:37 ` Matthias Brugger
2022-04-27 7:22 ` Nancy.Lin
2022-04-16 2:07 ` [PATCH v17 07/21] soc: mediatek: mmsys: modify reset controller for MT8195 vdosys1 Nancy.Lin
2022-04-21 1:56 ` Rex-BC Chen
2022-04-22 11:37 ` Matthias Brugger
2022-04-26 8:56 ` Nancy.Lin
2022-04-16 2:07 ` [PATCH v17 08/21] soc: mediatek: add mtk-mutex support for mt8195 vdosys1 Nancy.Lin
2022-04-21 1:58 ` Rex-BC Chen
2022-04-16 2:07 ` [PATCH v17 09/21] drm/mediatek: add display MDP RDMA support for MT8195 Nancy.Lin
2022-04-16 2:07 ` [PATCH v17 10/21] drm/mediatek: add display merge advance config API " Nancy.Lin
2022-04-16 2:07 ` [PATCH v17 11/21] drm/mediatek: add display merge start/stop API for cmdq support Nancy.Lin
2022-04-22 11:48 ` Matthias Brugger
2022-04-25 13:32 ` Chun-Kuang Hu
2022-04-25 15:27 ` Matthias Brugger
2022-04-16 2:07 ` Nancy.Lin [this message]
2022-04-16 2:07 ` [PATCH v17 13/21] drm/mediatek: add display merge async reset control Nancy.Lin
2022-04-25 9:58 ` Philipp Zabel
2022-04-26 10:28 ` Nancy.Lin
2022-04-16 2:07 ` [PATCH v17 14/21] drm/mediatek: add ETHDR support for MT8195 Nancy.Lin
2022-04-25 10:00 ` Philipp Zabel
2022-04-26 10:57 ` Nancy.Lin
2022-04-16 2:07 ` [PATCH v17 15/21] drm/mediatek: add mediatek-drm plane color encoding info Nancy.Lin
2022-04-16 2:07 ` [PATCH v17 16/21] drm/mediatek: add ovl_adaptor support for MT8195 Nancy.Lin
2022-04-16 2:07 ` [PATCH v17 17/21] drm/mediatek: add dma dev get function Nancy.Lin
2022-04-16 2:07 ` [PATCH v17 18/21] drm/mediatek: modify mediatek-drm for mt8195 multi mmsys support Nancy.Lin
2022-04-16 2:07 ` [PATCH v17 19/21] drm/mediatek: add drm ovl_adaptor sub driver for MT8195 Nancy.Lin
2022-04-16 2:07 ` [PATCH v17 20/21] drm/mediatek: add mediatek-drm of vdosys1 support " Nancy.Lin
2022-04-16 2:07 ` [PATCH v17 21/21] arm64: dts: mt8195: add display node for vdosys1 Nancy.Lin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220416020749.29010-13-nancy.lin@mediatek.com \
--to=nancy.lin@mediatek.com \
--cc=Project_Global_Chrome_Upstream_Group@mediatek.com \
--cc=airlied@linux.ie \
--cc=angelogioacchino.delregno@collabora.com \
--cc=chunkuang.hu@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=dri-devel@lists.freedesktop.org \
--cc=jason-jh.lin@mediatek.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mediatek@lists.infradead.org \
--cc=linux@roeck-us.net \
--cc=llvm@lists.linux.dev \
--cc=matthias.bgg@gmail.com \
--cc=nathan@kernel.org \
--cc=ndesaulniers@google.com \
--cc=p.zabel@pengutronix.de \
--cc=robh+dt@kernel.org \
--cc=singo.chang@mediatek.com \
--cc=srv_heupstream@mediatek.com \
--cc=wim@linux-watchdog.org \
--cc=yongqiang.niu@mediatek.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox