Commit a6b7c98a authored by Hsin-Yi Wang's avatar Hsin-Yi Wang Committed by Chun-Kuang Hu
Browse files

drm/mediatek: Add mtk_dither_set_common() function 



Current implementation of mtk_dither_set() cast dev data to
struct mtk_ddp_comp_dev. But other devices with different dev data
would also call this function.

Separate necessary parameters out so other device components (dither,
gamma) can call this function.

Signed-off-by: default avatarHsin-Yi Wang <hsinyi@chromium.org>
Reviewed-by: default avatarCK Hu <ck.hu@mediatek.com>
Signed-off-by: default avatarChun-Kuang Hu <chunkuang.hu@kernel.org>
parent e1e4f7fe

drivers/gpu/drm/mediatek/mtk_disp_drv.h

+4 −0
Original line number Diff line number Diff line
@@ -17,6 +17,10 @@ void mtk_color_config(struct device *dev, unsigned int w, 
		      unsigned int bpc, struct cmdq_pkt *cmdq_pkt);

void mtk_color_start(struct device *dev);



void mtk_dither_set_common(void __iomem *regs, struct cmdq_client_reg *cmdq_reg,

			   unsigned int bpc, unsigned int cfg,

			   unsigned int dither_en, struct cmdq_pkt *cmdq_pkt);



void mtk_dpi_start(struct device *dev);

void mtk_dpi_stop(struct device *dev);

drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c

+18 −9
Original line number Diff line number Diff line
@@ -151,31 +151,40 @@ static void mtk_ddp_clk_disable(struct device *dev) 
	clk_disable_unprepare(priv->clk);

}



static void mtk_dither_set(struct device *dev, unsigned int bpc,

		    unsigned int CFG, struct cmdq_pkt *cmdq_pkt)

{

	struct mtk_ddp_comp_dev *priv = dev_get_drvdata(dev);



void mtk_dither_set_common(void __iomem *regs, struct cmdq_client_reg *cmdq_reg,

			   unsigned int bpc, unsigned int cfg,

			   unsigned int dither_en, struct cmdq_pkt *cmdq_pkt)

{

	/* If bpc equal to 0, the dithering function didn't be enabled */

	if (bpc == 0)

		return;



	if (bpc >= MTK_MIN_BPC) {

		mtk_ddp_write(cmdq_pkt, 0, &priv->cmdq_reg, priv->regs, DISP_DITHER_5);

		mtk_ddp_write(cmdq_pkt, 0, &priv->cmdq_reg, priv->regs, DISP_DITHER_7);

		mtk_ddp_write(cmdq_pkt, 0, cmdq_reg, regs, DISP_DITHER_5);

		mtk_ddp_write(cmdq_pkt, 0, cmdq_reg, regs, DISP_DITHER_7);

		mtk_ddp_write(cmdq_pkt,

			      DITHER_LSB_ERR_SHIFT_R(MTK_MAX_BPC - bpc) |

			      DITHER_ADD_LSHIFT_R(MTK_MAX_BPC - bpc) |

			      DITHER_NEW_BIT_MODE,

			      &priv->cmdq_reg, priv->regs, DISP_DITHER_15);

			      cmdq_reg, regs, DISP_DITHER_15);

		mtk_ddp_write(cmdq_pkt,

			      DITHER_LSB_ERR_SHIFT_B(MTK_MAX_BPC - bpc) |

			      DITHER_ADD_LSHIFT_B(MTK_MAX_BPC - bpc) |

			      DITHER_LSB_ERR_SHIFT_G(MTK_MAX_BPC - bpc) |

			      DITHER_ADD_LSHIFT_G(MTK_MAX_BPC - bpc),

			      &priv->cmdq_reg, priv->regs, DISP_DITHER_16);

		mtk_ddp_write(cmdq_pkt, DISP_DITHERING, &priv->cmdq_reg, priv->regs, CFG);

			      cmdq_reg, regs, DISP_DITHER_16);

		mtk_ddp_write(cmdq_pkt, dither_en, cmdq_reg, regs, cfg);

	}

}



static void mtk_dither_set(struct device *dev, unsigned int bpc,

		    unsigned int cfg, struct cmdq_pkt *cmdq_pkt)

{

	struct mtk_ddp_comp_dev *priv = dev_get_drvdata(dev);



	mtk_dither_set_common(priv->regs, &priv->cmdq_reg, bpc, cfg,

			      DISP_DITHERING, cmdq_pkt);

}



static void mtk_od_config(struct device *dev, unsigned int w,