Hi, Nancy: On Mon, 2022-06-20 at 17:19 +0800, Nancy.Lin wrote: > Add merge start/stop API for cmdq support. The ovl_adaptor merges > are configured with each drm plane update. Need to enable/disable > merge with cmdq making sure all the settings taken effect in the > same vblank. 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 <nancy.lin@xxxxxxxxxxxx> > Reviewed-by: Chun-Kuang Hu <chunkuang.hu@xxxxxxxxxx> > Reviewed-by: AngeloGioacchino Del Regno < > angelogioacchino.delregno@xxxxxxxxxxxxx> > Tested-by: AngeloGioacchino Del Regno < > angelogioacchino.delregno@xxxxxxxxxxxxx> > Tested-by: Bo-Chen Chen <rex-bc.chen@xxxxxxxxxxxx> > --- > drivers/gpu/drm/mediatek/mtk_disp_drv.h | 2 ++ > drivers/gpu/drm/mediatek/mtk_disp_merge.c | 18 +++++++++++++++--- > 2 files changed, 17 insertions(+), 3 deletions(-) > > diff --git a/drivers/gpu/drm/mediatek/mtk_disp_drv.h > b/drivers/gpu/drm/mediatek/mtk_disp_drv.h > index e847e90f436d..33e61a136bbc 100644 > --- a/drivers/gpu/drm/mediatek/mtk_disp_drv.h > +++ b/drivers/gpu/drm/mediatek/mtk_disp_drv.h > @@ -66,6 +66,8 @@ void mtk_merge_stop(struct device *dev); > void mtk_merge_advance_config(struct device *dev, unsigned int l_w, > unsigned int r_w, > unsigned int h, unsigned int vrefresh, > unsigned int bpc, > struct cmdq_pkt *cmdq_pkt); > +void mtk_merge_start_cmdq(struct device *dev, struct cmdq_pkt > *cmdq_pkt); > +void mtk_merge_stop_cmdq(struct device *dev, struct cmdq_pkt > *cmdq_pkt); > > void mtk_ovl_bgclr_in_on(struct device *dev); > void mtk_ovl_bgclr_in_off(struct device *dev); > diff --git a/drivers/gpu/drm/mediatek/mtk_disp_merge.c > b/drivers/gpu/drm/mediatek/mtk_disp_merge.c > index 40da0555416d..c7af5ccab916 100644 > --- a/drivers/gpu/drm/mediatek/mtk_disp_merge.c > +++ b/drivers/gpu/drm/mediatek/mtk_disp_merge.c > @@ -67,17 +67,29 @@ struct mtk_disp_merge { > }; > > void mtk_merge_start(struct device *dev) > +{ > + mtk_merge_start_cmdq(dev, NULL); > +} > + > +void mtk_merge_stop(struct device *dev) > +{ > + mtk_merge_stop_cmdq(dev, NULL); > +} > + > +void mtk_merge_start_cmdq(struct device *dev, struct cmdq_pkt > *cmdq_pkt) > { > struct mtk_disp_merge *priv = dev_get_drvdata(dev); > > - writel(MERGE_EN, priv->regs + DISP_REG_MERGE_CTRL); > + mtk_ddp_write(cmdq_pkt, 1, &priv->cmdq_reg, priv->regs, > + DISP_REG_MERGE_CTRL); > } > > -void mtk_merge_stop(struct device *dev) > +void mtk_merge_stop_cmdq(struct device *dev, struct cmdq_pkt > *cmdq_pkt) > { > struct mtk_disp_merge *priv = dev_get_drvdata(dev); > > - writel(0x0, priv->regs + DISP_REG_MERGE_CTRL); > + mtk_ddp_write(cmdq_pkt, 0, &priv->cmdq_reg, priv->regs, > + DISP_REG_MERGE_CTRL); > } > > static void mtk_merge_fifo_setting(struct mtk_disp_merge *priv,
