From: Yongqiang Niu <yongqiang.niu@mediatek.com>
To: CK Hu <ck.hu@mediatek.com>,
Philipp Zabel <p.zabel@pengutronix.de>,
Rob Herring <robh+dt@kernel.org>,
Matthias Brugger <matthias.bgg@gmail.com>
Cc: David Airlie <airlied@linux.ie>, Daniel Vetter <daniel@ffwll.ch>,
Mark Rutland <mark.rutland@arm.com>,
<dri-devel@lists.freedesktop.org>, <devicetree@vger.kernel.org>,
<linux-kernel@vger.kernel.org>,
<linux-arm-kernel@lists.infradead.org>,
<linux-mediatek@lists.infradead.org>,
Yongqiang Niu <yongqiang.niu@mediatek.com>
Subject: [PATCH v6, 03/14] drm/mediatek: make sout select function format same with select input
Date: Thu, 2 Jan 2020 12:00:13 +0800 [thread overview]
Message-ID: <1577937624-14313-4-git-send-email-yongqiang.niu@mediatek.com> (raw)
In-Reply-To: <1577937624-14313-1-git-send-email-yongqiang.niu@mediatek.com>
there will be more sout case in the future,
make the sout function format same mtk_ddp_sel_in
Signed-off-by: Yongqiang Niu <yongqiang.niu@mediatek.com>
---
drivers/gpu/drm/mediatek/mtk_drm_ddp.c | 24 ++++++++++++++++--------
1 file changed, 16 insertions(+), 8 deletions(-)
diff --git a/drivers/gpu/drm/mediatek/mtk_drm_ddp.c b/drivers/gpu/drm/mediatek/mtk_drm_ddp.c
index 91c9b19..f99f89a1 100644
--- a/drivers/gpu/drm/mediatek/mtk_drm_ddp.c
+++ b/drivers/gpu/drm/mediatek/mtk_drm_ddp.c
@@ -389,17 +389,23 @@ static unsigned int mtk_ddp_sel_in(enum mtk_ddp_comp_id cur,
return value;
}
-static void mtk_ddp_sout_sel(struct regmap *config_regs,
- enum mtk_ddp_comp_id cur,
- enum mtk_ddp_comp_id next)
+static unsigned int mtk_ddp_sout_sel(enum mtk_ddp_comp_id cur,
+ enum mtk_ddp_comp_id next,
+ unsigned int *addr)
{
+ unsigned int value;
+
if (cur == DDP_COMPONENT_BLS && next == DDP_COMPONENT_DSI0) {
- regmap_write(config_regs, DISP_REG_CONFIG_OUT_SEL,
- BLS_TO_DSI_RDMA1_TO_DPI1);
+ *addr = DISP_REG_CONFIG_OUT_SEL;
+ value = BLS_TO_DSI_RDMA1_TO_DPI1;
} else if (cur == DDP_COMPONENT_BLS && next == DDP_COMPONENT_DPI0) {
- regmap_write(config_regs, DISP_REG_CONFIG_OUT_SEL,
- BLS_TO_DPI_RDMA1_TO_DSI);
+ *addr = DISP_REG_CONFIG_OUT_SEL;
+ value = BLS_TO_DPI_RDMA1_TO_DSI;
+ } else {
+ value = 0;
}
+
+ return value;
}
void mtk_ddp_add_comp_to_path(struct regmap *config_regs,
@@ -412,7 +418,9 @@ void mtk_ddp_add_comp_to_path(struct regmap *config_regs,
if (value)
regmap_update_bits(config_regs, addr, value, value);
- mtk_ddp_sout_sel(config_regs, cur, next);
+ value = mtk_ddp_sout_sel(cur, next, &addr);
+ if (value)
+ regmap_update_bits(config_regs, addr, value, value);
value = mtk_ddp_sel_in(cur, next, &addr);
if (value)
--
1.8.1.1.dirty
next prev parent reply other threads:[~2020-01-02 4:03 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-02 4:00 [PATCH v6, 00/14] add drm support for MT8183 Yongqiang Niu
2020-01-02 4:00 ` [PATCH v6, 01/14] arm64: dts: add display nodes for mt8183 Yongqiang Niu
2020-01-02 4:00 ` [PATCH v6, 02/14] drm/mediatek: move dsi/dpi select input into mtk_ddp_sel_in Yongqiang Niu
2020-01-02 5:03 ` CK Hu
2020-01-02 5:39 ` Yongqiang Niu
2020-01-02 6:02 ` CK Hu
2020-01-02 6:21 ` Yongqiang Niu
2020-01-02 6:40 ` CK Hu
2020-01-02 7:00 ` Yongqiang Niu
2020-01-02 4:00 ` Yongqiang Niu [this message]
2020-01-02 4:00 ` [PATCH v6, 04/14] drm/mediatek: add mmsys private data for ddp path config Yongqiang Niu
2020-01-02 5:33 ` CK Hu
2020-01-02 5:45 ` Yongqiang Niu
2020-01-02 4:00 ` [PATCH v6, 05/14] drm/mediatek: move rdma sout from mtk_ddp_mout_en into mtk_ddp_sout_sel Yongqiang Niu
2020-01-02 4:00 ` [PATCH v6, 06/14] drm/mediatek: add connection from OVL0 to OVL_2L0 Yongqiang Niu
2020-01-02 4:00 ` [PATCH v6, 07/14] drm/mediatek: add connection from RDMA0 to COLOR0 Yongqiang Niu
2020-01-02 4:00 ` [PATCH v6, 08/14] drm/mediatek: add connection from RDMA1 to DSI0 Yongqiang Niu
2020-01-02 4:00 ` [PATCH v6, 09/14] drm/mediatek: add connection from OVL_2L0 to RDMA0 Yongqiang Niu
2020-01-02 4:00 ` [PATCH v6, 10/14] drm/mediatek: add connection from OVL_2L1 to RDMA1 Yongqiang Niu
2020-01-02 4:00 ` [PATCH v6, 11/14] drm/mediatek: add connection from DITHER0 to DSI0 Yongqiang Niu
2020-01-02 4:00 ` [PATCH v6, 12/14] drm/mediatek: add connection from RDMA0 " Yongqiang Niu
2020-01-02 4:00 ` [PATCH v6, 13/14] drm/mediatek: add fifo_size into rdma private data Yongqiang Niu
2020-01-02 5:20 ` CK Hu
2020-01-02 5:42 ` Yongqiang Niu
2020-01-02 7:31 ` CK Hu
2020-01-02 4:00 ` [PATCH v6, 14/14] drm/mediatek: add support for mediatek SOC MT8183 Yongqiang Niu
2020-01-02 5:46 ` CK Hu
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=1577937624-14313-4-git-send-email-yongqiang.niu@mediatek.com \
--to=yongqiang.niu@mediatek.com \
--cc=airlied@linux.ie \
--cc=ck.hu@mediatek.com \
--cc=daniel@ffwll.ch \
--cc=devicetree@vger.kernel.org \
--cc=dri-devel@lists.freedesktop.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mediatek@lists.infradead.org \
--cc=mark.rutland@arm.com \
--cc=matthias.bgg@gmail.com \
--cc=p.zabel@pengutronix.de \
--cc=robh+dt@kernel.org \
/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).