mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-27 19:29:37 +00:00
drm/mediatek: Add fifo_size into rdma private data
Get the fifo size from device tree because each rdma in the same SoC may have different fifo size Signed-off-by: Yongqiang Niu <yongqiang.niu@mediatek.com> Signed-off-by: Chun-Kuang Hu <chunkuang.hu@kernel.org>
This commit is contained in:
parent
71dcadba34
commit
4d2598223d
1 changed files with 18 additions and 1 deletions
|
@ -68,6 +68,7 @@ struct mtk_disp_rdma {
|
|||
const struct mtk_disp_rdma_data *data;
|
||||
void (*vblank_cb)(void *data);
|
||||
void *vblank_cb_data;
|
||||
u32 fifo_size;
|
||||
};
|
||||
|
||||
static irqreturn_t mtk_disp_rdma_irq_handler(int irq, void *dev_id)
|
||||
|
@ -148,12 +149,18 @@ void mtk_rdma_config(struct device *dev, unsigned int width,
|
|||
unsigned int threshold;
|
||||
unsigned int reg;
|
||||
struct mtk_disp_rdma *rdma = dev_get_drvdata(dev);
|
||||
u32 rdma_fifo_size;
|
||||
|
||||
mtk_ddp_write_mask(cmdq_pkt, width, &rdma->cmdq_reg, rdma->regs,
|
||||
DISP_REG_RDMA_SIZE_CON_0, 0xfff);
|
||||
mtk_ddp_write_mask(cmdq_pkt, height, &rdma->cmdq_reg, rdma->regs,
|
||||
DISP_REG_RDMA_SIZE_CON_1, 0xfffff);
|
||||
|
||||
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
|
||||
|
@ -162,7 +169,7 @@ void mtk_rdma_config(struct device *dev, 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);
|
||||
mtk_ddp_write(cmdq_pkt, reg, &rdma->cmdq_reg, rdma->regs, DISP_REG_RDMA_FIFO_CON);
|
||||
}
|
||||
|
@ -297,6 +304,16 @@ static int mtk_disp_rdma_probe(struct platform_device *pdev)
|
|||
dev_dbg(dev, "get mediatek,gce-client-reg fail!\n");
|
||||
#endif
|
||||
|
||||
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;
|
||||
}
|
||||
}
|
||||
|
||||
/* Disable and clear pending interrupts */
|
||||
writel(0x0, priv->regs + DISP_REG_RDMA_INT_ENABLE);
|
||||
writel(0x0, priv->regs + DISP_REG_RDMA_INT_STATUS);
|
||||
|
|
Loading…
Reference in a new issue