From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailgw01.mediatek.com (unknown [60.244.123.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1C8067A for ; Tue, 28 Jun 2022 01:38:04 +0000 (UTC) X-UUID: c866ff08342c4b9cace1d2c94e394864-20220628 X-CID-P-RULE: Release_Ham X-CID-O-INFO: VERSION:1.1.7,REQID:ef4bf89d-eb2f-4a90-9f22-8a9b2476a896,OB:0,LO B:10,IP:0,URL:5,TC:0,Content:-5,EDM:0,RT:0,SF:45,FILE:0,RULE:Release_Ham,A CTION:release,TS:45 X-CID-INFO: VERSION:1.1.7,REQID:ef4bf89d-eb2f-4a90-9f22-8a9b2476a896,OB:0,LOB: 10,IP:0,URL:5,TC:0,Content:-5,EDM:0,RT:0,SF:45,FILE:0,RULE:Release_Ham,ACT ION:release,TS:45 X-CID-META: VersionHash:87442a2,CLOUDID:e6c8fdd5-5d6d-4eaf-a635-828a3ee48b7c,C OID:e8416156aa42,Recheck:0,SF:28|17|19|48,TC:nil,Content:0,EDM:-3,IP:nil,U RL:1,File:nil,QS:nil,BEC:nil,COL:0 X-UUID: c866ff08342c4b9cace1d2c94e394864-20220628 Received: from mtkcas10.mediatek.inc [(172.21.101.39)] by mailgw01.mediatek.com (envelope-from ) (Generic MTA with TLSv1.2 ECDHE-RSA-AES256-SHA384 256/256) with ESMTP id 1640626052; Tue, 28 Jun 2022 09:38:00 +0800 Received: from mtkcas10.mediatek.inc (172.21.101.39) by mtkmbs11n1.mediatek.inc (172.21.101.185) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.2.792.3; Tue, 28 Jun 2022 09:37:58 +0800 Received: from mtksdccf07 (172.21.84.99) by mtkcas10.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Tue, 28 Jun 2022 09:37:58 +0800 Message-ID: Subject: Re: [PATCH v23 06/14] drm/mediatek: add display merge mute/unmute support for MT8195 From: CK Hu To: Nancy.Lin , Rob Herring , Matthias Brugger , Chun-Kuang Hu , Philipp Zabel , , AngeloGioacchino Del Regno , CC: , , Yongqiang Niu , David Airlie , "jason-jh . lin" , , , Nick Desaulniers , , , "Nathan Chancellor" , , Date: Tue, 28 Jun 2022 09:37:58 +0800 In-Reply-To: <20220620091930.27797-7-nancy.lin@mediatek.com> References: <20220620091930.27797-1-nancy.lin@mediatek.com> <20220620091930.27797-7-nancy.lin@mediatek.com> Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.28.5-0ubuntu0.18.04.2 Precedence: bulk X-Mailing-List: llvm@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-MTK: N Hi, Nancy: On Mon, 2022-06-20 at 17:19 +0800, Nancy.Lin wrote: > Add merge mute/unmute setting for MT8195. > MT8195 Vdosys1 merge1~merge4 support HW mute function. Applied to mediatek-drm-next [1], thanks. [1] https://git.kernel.org/pub/scm/linux/kernel/git/chunkuang.hu/linux.git/log/?h=mediatek-drm-next Regards, CK > > Signed-off-by: Nancy.Lin > Reviewed-by: Chun-Kuang Hu > Reviewed-by: AngeloGioacchino Del Regno < > angelogioacchino.delregno@collabora.com> > Tested-by: AngeloGioacchino Del Regno < > angelogioacchino.delregno@collabora.com> > Tested-by: Bo-Chen Chen > --- > 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); 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 gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (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 B24B1C433EF for ; Tue, 28 Jun 2022 01:38:07 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id AF95A10E1F2; Tue, 28 Jun 2022 01:38:06 +0000 (UTC) Received: from mailgw01.mediatek.com (unknown [60.244.123.138]) by gabe.freedesktop.org (Postfix) with ESMTPS id CA67F10E1F2 for ; Tue, 28 Jun 2022 01:38:04 +0000 (UTC) X-UUID: c866ff08342c4b9cace1d2c94e394864-20220628 X-CID-P-RULE: Release_Ham X-CID-O-INFO: VERSION:1.1.7, REQID:ef4bf89d-eb2f-4a90-9f22-8a9b2476a896, OB:0, LO B:10,IP:0,URL:5,TC:0,Content:-5,EDM:0,RT:0,SF:45,FILE:0,RULE:Release_Ham,A CTION:release,TS:45 X-CID-INFO: VERSION:1.1.7, REQID:ef4bf89d-eb2f-4a90-9f22-8a9b2476a896, OB:0, LOB: 10,IP:0,URL:5,TC:0,Content:-5,EDM:0,RT:0,SF:45,FILE:0,RULE:Release_Ham,ACT ION:release,TS:45 X-CID-META: VersionHash:87442a2, CLOUDID:e6c8fdd5-5d6d-4eaf-a635-828a3ee48b7c, C OID:e8416156aa42,Recheck:0,SF:28|17|19|48,TC:nil,Content:0,EDM:-3,IP:nil,U RL:1,File:nil,QS:nil,BEC:nil,COL:0 X-UUID: c866ff08342c4b9cace1d2c94e394864-20220628 Received: from mtkcas10.mediatek.inc [(172.21.101.39)] by mailgw01.mediatek.com (envelope-from ) (Generic MTA with TLSv1.2 ECDHE-RSA-AES256-SHA384 256/256) with ESMTP id 1640626052; Tue, 28 Jun 2022 09:38:00 +0800 Received: from mtkcas10.mediatek.inc (172.21.101.39) by mtkmbs11n1.mediatek.inc (172.21.101.185) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.2.792.3; Tue, 28 Jun 2022 09:37:58 +0800 Received: from mtksdccf07 (172.21.84.99) by mtkcas10.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Tue, 28 Jun 2022 09:37:58 +0800 Message-ID: Subject: Re: [PATCH v23 06/14] drm/mediatek: add display merge mute/unmute support for MT8195 From: CK Hu To: Nancy.Lin , Rob Herring , Matthias Brugger , Chun-Kuang Hu , Philipp Zabel , , AngeloGioacchino Del Regno , Date: Tue, 28 Jun 2022 09:37:58 +0800 In-Reply-To: <20220620091930.27797-7-nancy.lin@mediatek.com> References: <20220620091930.27797-1-nancy.lin@mediatek.com> <20220620091930.27797-7-nancy.lin@mediatek.com> Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.28.5-0ubuntu0.18.04.2 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-MTK: N X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, David Airlie , "jason-jh . lin" , singo.chang@mediatek.com, llvm@lists.linux.dev, Nick Desaulniers , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Project_Global_Chrome_Upstream_Group@mediatek.com, linux-mediatek@lists.infradead.org, Yongqiang Niu , Nathan Chancellor , linux-arm-kernel@lists.infradead.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Hi, Nancy: On Mon, 2022-06-20 at 17:19 +0800, Nancy.Lin wrote: > Add merge mute/unmute setting for MT8195. > MT8195 Vdosys1 merge1~merge4 support HW mute function. Applied to mediatek-drm-next [1], thanks. [1] https://git.kernel.org/pub/scm/linux/kernel/git/chunkuang.hu/linux.git/log/?h=mediatek-drm-next Regards, CK > > Signed-off-by: Nancy.Lin > Reviewed-by: Chun-Kuang Hu > Reviewed-by: AngeloGioacchino Del Regno < > angelogioacchino.delregno@collabora.com> > Tested-by: AngeloGioacchino Del Regno < > angelogioacchino.delregno@collabora.com> > Tested-by: Bo-Chen Chen > --- > 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); 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 CA28BC433EF for ; Tue, 28 Jun 2022 06:09:42 +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: Date:CC:To:From:Subject:Message-ID:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=1AxeqVkGjz8Om3HHdhH7eZj3p/iow6augBUWbWAOMwQ=; b=3dDgkgbJySe0xK 8Kh3oEoUgqJWhSz+ga4kGnasIVuLtD51o7wlpnavg4RD68N+tjPF1W4YCG5fMCCZlxHxobL31FvPf +63ZL8yF9O6U0o+I/SbRWQ4mWAinx8bnR5XTfBR+82bLJA8O8Ud4zPEWhK9fDGNh5RxEjlZawy8p4 1cx07XHUVSkwOrDCn3TLdSdHpCZR9EfS4w8+izj2qMwMTAlfMkb7UeFdD+dTS7A4GdOunvmBIlVBw fvxIF7OZhz7PafCq6nDVf1ygzS6GcBcjXb5AdWFKd3h+nLu07rjGgPzWXqOd6efo4+pltNb9/MPPR jsLZAfieIQuVS4ytBMRQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1o64Om-004aHV-3Y; Tue, 28 Jun 2022 06:08:32 +0000 Received: from mailgw01.mediatek.com ([216.200.240.184]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1o64Ec-004VWq-TG; Tue, 28 Jun 2022 05:58:07 +0000 X-UUID: 0b86b7094b944875834adf21acc6c788-20220627 X-CID-P-RULE: Release_Ham X-CID-O-INFO: VERSION:1.1.7,REQID:ce43f788-bddb-4732-8f7c-579561fa82bd,OB:0,LO B:0,IP:0,URL:5,TC:0,Content:-5,EDM:0,RT:0,SF:0,FILE:0,RULE:Release_Ham,ACT ION:release,TS:0 X-CID-META: VersionHash:87442a2,CLOUDID:6b1af585-57f0-47ca-ba27-fe8c57fbf305,C OID:IGNORED,Recheck:0,SF:nil,TC:nil,Content:0,EDM:-3,IP:nil,URL:1,File:nil ,QS:nil,BEC:nil,COL:0 X-UUID: 0b86b7094b944875834adf21acc6c788-20220627 Received: from mtkmbs11n1.mediatek.inc [(172.21.101.185)] by mailgw01.mediatek.com (envelope-from ) (musrelay.mediatek.com ESMTP with TLSv1.2 ECDHE-RSA-AES256-GCM-SHA384 256/256) with ESMTP id 1225414644; Mon, 27 Jun 2022 22:57:57 -0700 Received: from mtkcas10.mediatek.inc (172.21.101.39) by mtkmbs11n1.mediatek.inc (172.21.101.185) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.2.792.3; Tue, 28 Jun 2022 09:37:58 +0800 Received: from mtksdccf07 (172.21.84.99) by mtkcas10.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Tue, 28 Jun 2022 09:37:58 +0800 Message-ID: Subject: Re: [PATCH v23 06/14] drm/mediatek: add display merge mute/unmute support for MT8195 From: CK Hu To: Nancy.Lin , Rob Herring , Matthias Brugger , Chun-Kuang Hu , Philipp Zabel , , AngeloGioacchino Del Regno , CC: , , Yongqiang Niu , David Airlie , "jason-jh . lin" , , , Nick Desaulniers , , , "Nathan Chancellor" , , Date: Tue, 28 Jun 2022 09:37:58 +0800 In-Reply-To: <20220620091930.27797-7-nancy.lin@mediatek.com> References: <20220620091930.27797-1-nancy.lin@mediatek.com> <20220620091930.27797-7-nancy.lin@mediatek.com> X-Mailer: Evolution 3.28.5-0ubuntu0.18.04.2 MIME-Version: 1.0 X-MTK: N X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220627_225803_029546_9168C216 X-CRM114-Status: GOOD ( 16.21 ) 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 Hi, Nancy: On Mon, 2022-06-20 at 17:19 +0800, Nancy.Lin wrote: > Add merge mute/unmute setting for MT8195. > MT8195 Vdosys1 merge1~merge4 support HW mute function. Applied to mediatek-drm-next [1], thanks. [1] https://git.kernel.org/pub/scm/linux/kernel/git/chunkuang.hu/linux.git/log/?h=mediatek-drm-next Regards, CK > > Signed-off-by: Nancy.Lin > Reviewed-by: Chun-Kuang Hu > Reviewed-by: AngeloGioacchino Del Regno < > angelogioacchino.delregno@collabora.com> > Tested-by: AngeloGioacchino Del Regno < > angelogioacchino.delregno@collabora.com> > Tested-by: Bo-Chen Chen > --- > 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); _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel