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: David Airlie <airlied@linux.ie>, Daniel Vetter <daniel@ffwll.ch>,
"Nathan Chancellor" <nathan@kernel.org>,
Nick Desaulniers <ndesaulniers@google.com>,
"Nancy . Lin" <nancy.lin@mediatek.com>,
"jason-jh . lin" <jason-jh.lin@mediatek.com>,
Yongqiang Niu <yongqiang.niu@mediatek.com>,
<devicetree@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
<linux-arm-kernel@lists.infradead.org>,
<linux-mediatek@lists.infradead.org>,
<dri-devel@lists.freedesktop.org>, <llvm@lists.linux.dev>,
<singo.chang@mediatek.com>,
<Project_Global_Chrome_Upstream_Group@mediatek.com>
Subject: [PATCH v19 16/25] drm/mediatek: add display merge mute/unmute support for MT8195
Date: Tue, 3 May 2022 18:23:36 +0800 [thread overview]
Message-ID: <20220503102345.22817-17-nancy.lin@mediatek.com> (raw)
In-Reply-To: <20220503102345.22817-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 c7af5ccab916..2e13d2fb429e 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)
@@ -80,6 +83,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);
}
@@ -88,6 +95,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);
}
@@ -262,6 +273,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
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2022-05-03 10:36 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-03 10:23 [PATCH v19 00/25] Add MediaTek SoC DRM (vdosys1) support for mt8195 Nancy.Lin
2022-05-03 10:23 ` [PATCH v19 01/25] dt-bindings: mediatek: add vdosys1 RDMA definition " Nancy.Lin
2022-05-03 10:23 ` [PATCH v19 02/25] dt-bindings: reset: mt8195: add vdosys1 reset control bit Nancy.Lin
2022-05-04 3:50 ` Rex-BC Chen
2022-05-04 6:06 ` Nancy.Lin
2022-05-03 10:23 ` [PATCH v19 03/25] dt-bindings: mediatek: add ethdr definition for mt8195 Nancy.Lin
2022-05-03 10:23 ` [PATCH v19 04/25] soc: mediatek: add mtk-mmsys ethdr and mdp_rdma components Nancy.Lin
2022-05-03 12:19 ` AngeloGioacchino Del Regno
2022-05-04 3:39 ` CK Hu
2022-05-03 10:23 ` [PATCH v19 05/25] soc: mediatek: add mtk-mmsys support for mt8195 vdosys1 Nancy.Lin
2022-05-04 3:45 ` CK Hu
2022-05-03 10:23 ` [PATCH v19 06/25] soc: mediatek: add mtk_mmsys_write_reg API Nancy.Lin
2022-05-03 12:19 ` AngeloGioacchino Del Regno
2022-05-04 1:36 ` Nancy.Lin
2022-05-03 10:23 ` [PATCH v19 07/25] soc: mediatek: add mtk-mmsys config API for mt8195 vdosys1 Nancy.Lin
2022-05-04 5:05 ` CK Hu
2022-05-03 10:23 ` [PATCH v19 08/25] soc: mediatek: add cmdq support of " Nancy.Lin
2022-05-04 5:28 ` CK Hu
2022-05-04 5:59 ` Nancy.Lin
2022-05-03 10:23 ` [PATCH v19 09/25] soc: mediatek: mmsys: add mmsys for support 64 reset bits Nancy.Lin
2022-05-03 12:19 ` AngeloGioacchino Del Regno
2022-05-04 5:34 ` CK Hu
2022-05-03 10:23 ` [PATCH v19 10/25] soc: mediatek: mmsys: add reset control for MT8195 vdosys1 Nancy.Lin
2022-05-04 5:37 ` CK Hu
2022-05-03 10:23 ` [PATCH v19 11/25] soc: mediatek: add mtk-mutex component - dp_intf1 Nancy.Lin
2022-05-03 12:19 ` AngeloGioacchino Del Regno
2022-05-04 5:53 ` CK Hu
2022-05-03 10:23 ` [PATCH v19 12/25] soc: mediatek: add mtk-mutex support for mt8195 vdosys1 Nancy.Lin
2022-05-04 5:55 ` CK Hu
2022-05-03 10:23 ` [PATCH v19 13/25] drm/mediatek: add display MDP RDMA support for MT8195 Nancy.Lin
2022-05-03 10:23 ` [PATCH v19 14/25] drm/mediatek: add display merge advance config API " Nancy.Lin
2022-05-03 10:23 ` [PATCH v19 15/25] drm/mediatek: add display merge start/stop API for cmdq support Nancy.Lin
2022-05-03 10:23 ` Nancy.Lin [this message]
2022-05-03 10:23 ` [PATCH v19 17/25] drm/mediatek: add display merge async reset control Nancy.Lin
2022-05-03 10:23 ` [PATCH v19 18/25] drm/mediatek: add ETHDR support for MT8195 Nancy.Lin
2022-05-03 10:23 ` [PATCH v19 19/25] drm/mediatek: add mediatek-drm plane color encoding info Nancy.Lin
2022-05-03 10:23 ` [PATCH v19 20/25] drm/mediatek: add ovl_adaptor support for MT8195 Nancy.Lin
2022-05-03 10:23 ` [PATCH v19 21/25] drm/mediatek: add dma dev get function Nancy.Lin
2022-05-03 10:23 ` [PATCH v19 22/25] drm/mediatek: modify mediatek-drm for mt8195 multi mmsys support Nancy.Lin
2022-05-03 10:23 ` [PATCH v19 23/25] drm/mediatek: add drm ovl_adaptor sub driver for MT8195 Nancy.Lin
2022-05-03 10:23 ` [PATCH v19 24/25] drm/mediatek: add mediatek-drm of vdosys1 support " Nancy.Lin
2022-05-03 10:23 ` [PATCH v19 25/25] 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=20220503102345.22817-17-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=daniel@ffwll.ch \
--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=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;
as well as URLs for NNTP newsgroup(s).