All of lore.kernel.org
 help / color / mirror / Atom feed
From: Nancy.Lin <nancy.lin@mediatek.com>
To: CK Hu <ck.hu@mediatek.com>
Cc: Chun-Kuang Hu <chunkuang.hu@kernel.org>,
	srv_heupstream@mediatek.com, devicetree@vger.kernel.org,
	David Airlie <airlied@linux.ie>,
	"jason-jh . lin" <jason-jh.lin@mediatek.com>,
	singo.chang@mediatek.com, linux-kernel@vger.kernel.org,
	dri-devel@lists.freedesktop.org,
	Yongqiang Niu <yongqiang.niu@mediatek.com>,
	Rob Herring <robh+dt@kernel.org>,
	linux-mediatek@lists.infradead.org,
	Matthias Brugger <matthias.bgg@gmail.com>,
	"Nancy . Lin" <nancy.lin@mediatek.com>,
	linux-arm-kernel@lists.infradead.org
Subject: [PATCH v8 15/22] drm/mediatek: add display merge mute/unmute support for MT8195
Date: Wed, 17 Nov 2021 16:59:12 +0800	[thread overview]
Message-ID: <20211117085919.28691-16-nancy.lin@mediatek.com> (raw)
In-Reply-To: <20211117085919.28691-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>
---
 drivers/gpu/drm/mediatek/mtk_disp_merge.c | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/drivers/gpu/drm/mediatek/mtk_disp_merge.c b/drivers/gpu/drm/mediatek/mtk_disp_merge.c
index 92c81ce24a49..dff2797a2f68 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;
+	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


WARNING: multiple messages have this Message-ID (diff)
From: Nancy.Lin <nancy.lin@mediatek.com>
To: CK Hu <ck.hu@mediatek.com>
Cc: Chun-Kuang Hu <chunkuang.hu@kernel.org>,
	Philipp Zabel <p.zabel@pengutronix.de>,
	David Airlie <airlied@linux.ie>, Daniel Vetter <daniel@ffwll.ch>,
	Rob Herring <robh+dt@kernel.org>,
	Matthias Brugger <matthias.bgg@gmail.com>,
	"jason-jh . lin" <jason-jh.lin@mediatek.com>,
	"Nancy . Lin" <nancy.lin@mediatek.com>,
	Yongqiang Niu <yongqiang.niu@mediatek.com>,
	<dri-devel@lists.freedesktop.org>,
	<linux-mediatek@lists.infradead.org>,
	<devicetree@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
	<linux-arm-kernel@lists.infradead.org>,
	<singo.chang@mediatek.com>, <srv_heupstream@mediatek.com>
Subject: [PATCH v8 15/22] drm/mediatek: add display merge mute/unmute support for MT8195
Date: Wed, 17 Nov 2021 16:59:12 +0800	[thread overview]
Message-ID: <20211117085919.28691-16-nancy.lin@mediatek.com> (raw)
In-Reply-To: <20211117085919.28691-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>
---
 drivers/gpu/drm/mediatek/mtk_disp_merge.c | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/drivers/gpu/drm/mediatek/mtk_disp_merge.c b/drivers/gpu/drm/mediatek/mtk_disp_merge.c
index 92c81ce24a49..dff2797a2f68 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;
+	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


_______________________________________________
Linux-mediatek mailing list
Linux-mediatek@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-mediatek

WARNING: multiple messages have this Message-ID (diff)
From: Nancy.Lin <nancy.lin@mediatek.com>
To: CK Hu <ck.hu@mediatek.com>
Cc: Chun-Kuang Hu <chunkuang.hu@kernel.org>,
	Philipp Zabel <p.zabel@pengutronix.de>,
	David Airlie <airlied@linux.ie>, Daniel Vetter <daniel@ffwll.ch>,
	Rob Herring <robh+dt@kernel.org>,
	Matthias Brugger <matthias.bgg@gmail.com>,
	"jason-jh . lin" <jason-jh.lin@mediatek.com>,
	"Nancy . Lin" <nancy.lin@mediatek.com>,
	Yongqiang Niu <yongqiang.niu@mediatek.com>,
	<dri-devel@lists.freedesktop.org>,
	<linux-mediatek@lists.infradead.org>,
	<devicetree@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
	<linux-arm-kernel@lists.infradead.org>,
	<singo.chang@mediatek.com>, <srv_heupstream@mediatek.com>
Subject: [PATCH v8 15/22] drm/mediatek: add display merge mute/unmute support for MT8195
Date: Wed, 17 Nov 2021 16:59:12 +0800	[thread overview]
Message-ID: <20211117085919.28691-16-nancy.lin@mediatek.com> (raw)
In-Reply-To: <20211117085919.28691-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>
---
 drivers/gpu/drm/mediatek/mtk_disp_merge.c | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/drivers/gpu/drm/mediatek/mtk_disp_merge.c b/drivers/gpu/drm/mediatek/mtk_disp_merge.c
index 92c81ce24a49..dff2797a2f68 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;
+	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


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

  parent reply	other threads:[~2021-11-17  9:00 UTC|newest]

Thread overview: 69+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-11-17  8:58 [PATCH v8 00/22] Add MediaTek SoC DRM (vdosys1) support for mt8195 Nancy.Lin
2021-11-17  8:58 ` Nancy.Lin
2021-11-17  8:58 ` Nancy.Lin
2021-11-17  8:58 ` [PATCH v8 01/22] dt-bindings: mediatek: add vdosys1 RDMA definition " Nancy.Lin
2021-11-17  8:58   ` Nancy.Lin
2021-11-17  8:58   ` Nancy.Lin
2021-11-17  8:58 ` [PATCH v8 02/22] dt-bindings: mediatek: add vdosys1 MERGE property " Nancy.Lin
2021-11-17  8:58   ` Nancy.Lin
2021-11-17  8:58   ` Nancy.Lin
2021-11-17  8:59 ` [PATCH v8 03/22] dt-bindings: mediatek: add ethdr definition " Nancy.Lin
2021-11-17  8:59   ` Nancy.Lin
2021-11-17  8:59   ` Nancy.Lin
2021-11-17  8:59 ` [PATCH v8 04/22] dt-bindings: reset: mt8195: add vdosys1 reset control bit Nancy.Lin
2021-11-17  8:59   ` Nancy.Lin
2021-11-17  8:59   ` Nancy.Lin
2021-11-17  8:59 ` [PATCH v8 05/22] arm64: dts: mt8195: add display node for vdosys1 Nancy.Lin
2021-11-17  8:59   ` Nancy.Lin
2021-11-17  8:59   ` Nancy.Lin
2021-11-17  8:59 ` [PATCH v8 06/22] soc: mediatek: add mtk-mmsys support for mt8195 vdosys1 Nancy.Lin
2021-11-17  8:59   ` Nancy.Lin
2021-11-17  8:59   ` Nancy.Lin
2021-11-17  8:59 ` [PATCH v8 07/22] soc: mediatek: add mtk-mmsys config API " Nancy.Lin
2021-11-17  8:59   ` Nancy.Lin
2021-11-17  8:59   ` Nancy.Lin
2021-11-17  8:59 ` [PATCH v8 08/22] soc: mediatek: add cmdq support of " Nancy.Lin
2021-11-17  8:59   ` Nancy.Lin
2021-11-17  8:59   ` Nancy.Lin
2021-11-17  8:59 ` [PATCH v8 09/22] soc: mediatek: mmsys: modify reset controller for MT8195 vdosys1 Nancy.Lin
2021-11-17  8:59   ` Nancy.Lin
2021-11-17  8:59   ` Nancy.Lin
2021-11-17  8:59 ` [PATCH v8 10/22] soc: mediatek: change the mutex defines and the mutex_mod type Nancy.Lin
2021-11-17  8:59   ` Nancy.Lin
2021-11-17  8:59   ` Nancy.Lin
2021-11-17  8:59 ` [PATCH v8 11/22] soc: mediatek: add mtk-mutex support for mt8195 vdosys1 Nancy.Lin
2021-11-17  8:59   ` Nancy.Lin
2021-11-17  8:59   ` Nancy.Lin
2021-11-17  8:59 ` [PATCH v8 12/22] drm/mediatek: add display MDP RDMA support for MT8195 Nancy.Lin
2021-11-17  8:59   ` Nancy.Lin
2021-11-17  8:59   ` Nancy.Lin
2021-11-17  8:59 ` [PATCH v8 13/22] drm/mediatek: add display merge advance config API " Nancy.Lin
2021-11-17  8:59   ` Nancy.Lin
2021-11-17  8:59   ` Nancy.Lin
2021-11-17  8:59 ` [PATCH v8 14/22] drm/mediatek: add display merge start/stop API for cmdq support Nancy.Lin
2021-11-17  8:59   ` Nancy.Lin
2021-11-17  8:59   ` Nancy.Lin
2021-11-17  8:59 ` Nancy.Lin [this message]
2021-11-17  8:59   ` [PATCH v8 15/22] drm/mediatek: add display merge mute/unmute support for MT8195 Nancy.Lin
2021-11-17  8:59   ` Nancy.Lin
2021-11-17  8:59 ` [PATCH v8 16/22] drm/mediatek: add display merge async reset control Nancy.Lin
2021-11-17  8:59   ` Nancy.Lin
2021-11-17  8:59   ` Nancy.Lin
2021-11-17  8:59 ` [PATCH v8 17/22] drm/mediatek: add ETHDR support for MT8195 Nancy.Lin
2021-11-17  8:59   ` Nancy.Lin
2021-11-17  8:59   ` Nancy.Lin
2021-11-17  8:59 ` [PATCH v8 18/22] drm/mediatek: add mediatek-drm plane color encoding info Nancy.Lin
2021-11-17  8:59   ` Nancy.Lin
2021-11-17  8:59   ` Nancy.Lin
2021-11-17  8:59 ` [PATCH v8 19/22] drm/mediatek: add ovl_adaptor support for MT8195 Nancy.Lin
2021-11-17  8:59   ` Nancy.Lin
2021-11-17  8:59   ` Nancy.Lin
2021-11-17  8:59 ` [PATCH v8 20/22] drm/mediatek: modify mediatek-drm for mt8195 multi mmsys support Nancy.Lin
2021-11-17  8:59   ` Nancy.Lin
2021-11-17  8:59   ` Nancy.Lin
2021-11-17  8:59 ` [PATCH v8 21/22] drm/mediatek: add drm ovl_adaptor sub driver for MT8195 Nancy.Lin
2021-11-17  8:59   ` Nancy.Lin
2021-11-17  8:59   ` Nancy.Lin
2021-11-17  8:59 ` [PATCH v8 22/22] drm/mediatek: add mediatek-drm of vdosys1 support " Nancy.Lin
2021-11-17  8:59   ` Nancy.Lin
2021-11-17  8:59   ` 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=20211117085919.28691-16-nancy.lin@mediatek.com \
    --to=nancy.lin@mediatek.com \
    --cc=airlied@linux.ie \
    --cc=chunkuang.hu@kernel.org \
    --cc=ck.hu@mediatek.com \
    --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=matthias.bgg@gmail.com \
    --cc=robh+dt@kernel.org \
    --cc=singo.chang@mediatek.com \
    --cc=srv_heupstream@mediatek.com \
    --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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.