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, 13/14] drm/mediatek: add fifo_size into rdma private data
Date: Thu, 2 Jan 2020 12:00:23 +0800 [thread overview]
Message-ID: <1577937624-14313-14-git-send-email-yongqiang.niu@mediatek.com> (raw)
In-Reply-To: <1577937624-14313-1-git-send-email-yongqiang.niu@mediatek.com>
the fifo size of rdma in mt8183 is different.
rdma0 fifo size is 5k
rdma1 fifo size is 2k
Signed-off-by: Yongqiang Niu <yongqiang.niu@mediatek.com>
---
drivers/gpu/drm/mediatek/mtk_disp_rdma.c | 21 ++++++++++++++++++++-
1 file changed, 20 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/mediatek/mtk_disp_rdma.c b/drivers/gpu/drm/mediatek/mtk_disp_rdma.c
index 405afef..691480b 100644
--- a/drivers/gpu/drm/mediatek/mtk_disp_rdma.c
+++ b/drivers/gpu/drm/mediatek/mtk_disp_rdma.c
@@ -62,6 +62,7 @@ struct mtk_disp_rdma {
struct mtk_ddp_comp ddp_comp;
struct drm_crtc *crtc;
const struct mtk_disp_rdma_data *data;
+ u32 fifo_size;
};
static inline struct mtk_disp_rdma *comp_to_rdma(struct mtk_ddp_comp *comp)
@@ -130,10 +131,16 @@ static void mtk_rdma_config(struct mtk_ddp_comp *comp, unsigned int width,
unsigned int threshold;
unsigned int reg;
struct mtk_disp_rdma *rdma = comp_to_rdma(comp);
+ u32 rdma_fifo_size;
rdma_update_bits(comp, DISP_REG_RDMA_SIZE_CON_0, 0xfff, width);
rdma_update_bits(comp, DISP_REG_RDMA_SIZE_CON_1, 0xfffff, height);
+ if (rdma->fifo_size)
+ rdma_fifo_size = rdma->fifo_size;
+ else
+ rdma_fifo_size = RDMA_FIFO_SIZE(rdma);
+
/*
* Enable FIFO underflow since DSI and DPI can't be blocked.
* Keep the FIFO pseudo size reset default of 8 KiB. Set the
@@ -142,7 +149,7 @@ static void mtk_rdma_config(struct mtk_ddp_comp *comp, unsigned int width,
*/
threshold = width * height * vrefresh * 4 * 7 / 1000000;
reg = RDMA_FIFO_UNDERFLOW_EN |
- RDMA_FIFO_PSEUDO_SIZE(RDMA_FIFO_SIZE(rdma)) |
+ RDMA_FIFO_PSEUDO_SIZE(rdma_fifo_size) |
RDMA_OUTPUT_VALID_FIFO_THRESHOLD(threshold);
writel(reg, comp->regs + DISP_REG_RDMA_FIFO_CON);
}
@@ -284,6 +291,18 @@ static int mtk_disp_rdma_probe(struct platform_device *pdev)
return comp_id;
}
+ if (of_find_property(dev->of_node, "mediatek,rdma_fifo_size", &ret)) {
+ ret = of_property_read_u32(dev->of_node,
+ "mediatek,rdma_fifo_size",
+ &priv->fifo_size);
+ if (ret) {
+ dev_err(dev, "Failed to get rdma fifo size\n");
+ return ret;
+ }
+
+ priv->fifo_size *= SZ_1K;
+ }
+
ret = mtk_ddp_comp_init(dev, dev->of_node, &priv->ddp_comp, comp_id,
&mtk_disp_rdma_funcs);
if (ret) {
--
1.8.1.1.dirty
next prev parent reply other threads:[~2020-01-02 4:02 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 ` [PATCH v6, 03/14] drm/mediatek: make sout select function format same with select input Yongqiang Niu
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 ` Yongqiang Niu [this message]
2020-01-02 5:20 ` [PATCH v6, 13/14] drm/mediatek: add fifo_size into rdma private data 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-14-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).