Commit a519e22b authored by Guillaume Ranquet's avatar Guillaume Ranquet Committed by Chun-Kuang Hu
Browse files

drm/mediatek: dpi: Move dimension mask to SoC config 



Add flexibility by moving the dimension mask to the SoC config

Signed-off-by: default avatarGuillaume Ranquet <granquet@baylibre.com>
Signed-off-by: default avatarBo-Chen Chen <rex-bc.chen@mediatek.com>
Reviewed-by: default avatarAngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Reviewed-by: default avatarRex-BC Chen <rex-bc.chen@mediatek.com>
Link: https://patchwork.kernel.org/project/linux-mediatek/patch/20220701035845.16458-9-rex-bc.chen@mediatek.com/


Signed-off-by: default avatarChun-Kuang Hu <chunkuang.hu@kernel.org>
parent 3145095f

drivers/gpu/drm/mediatek/mtk_dpi.c

+17 −10
Original line number Diff line number Diff line
@@ -122,6 +122,8 @@ struct mtk_dpi_yc_limit { 
 * @num_output_fmts: Quantity of supported output formats.

 * @is_ck_de_pol: Support CK/DE polarity.

 * @swap_input_support: Support input swap function.

 * @dimension_mask: Mask used for HWIDTH, HPORCH, VSYNC_WIDTH and VSYNC_PORCH

 *		    (no shift).

 */

struct mtk_dpi_conf {

	unsigned int (*cal_factor)(int clock);
@@ -132,6 +134,7 @@ struct mtk_dpi_conf { 
	u32 num_output_fmts;

	bool is_ck_de_pol;

	bool swap_input_support;

	u32 dimension_mask;

};



static void mtk_dpi_mask(struct mtk_dpi *dpi, u32 offset, u32 val, u32 mask)
@@ -160,30 +163,30 @@ static void mtk_dpi_disable(struct mtk_dpi *dpi) 
static void mtk_dpi_config_hsync(struct mtk_dpi *dpi,

				 struct mtk_dpi_sync_param *sync)

{

	mtk_dpi_mask(dpi, DPI_TGEN_HWIDTH,

		     sync->sync_width << HPW, HPW_MASK);

	mtk_dpi_mask(dpi, DPI_TGEN_HPORCH,

		     sync->back_porch << HBP, HBP_MASK);

	mtk_dpi_mask(dpi, DPI_TGEN_HWIDTH, sync->sync_width << HPW,

		     dpi->conf->dimension_mask << HPW);

	mtk_dpi_mask(dpi, DPI_TGEN_HPORCH, sync->back_porch << HBP,

		     dpi->conf->dimension_mask << HBP);

	mtk_dpi_mask(dpi, DPI_TGEN_HPORCH, sync->front_porch << HFP,

		     HFP_MASK);

		     dpi->conf->dimension_mask << HFP);

}



static void mtk_dpi_config_vsync(struct mtk_dpi *dpi,

				 struct mtk_dpi_sync_param *sync,

				 u32 width_addr, u32 porch_addr)

{

	mtk_dpi_mask(dpi, width_addr,

		     sync->sync_width << VSYNC_WIDTH_SHIFT,

		     VSYNC_WIDTH_MASK);

	mtk_dpi_mask(dpi, width_addr,

		     sync->shift_half_line << VSYNC_HALF_LINE_SHIFT,

		     VSYNC_HALF_LINE_MASK);

	mtk_dpi_mask(dpi, width_addr,

		     sync->sync_width << VSYNC_WIDTH_SHIFT,

		     dpi->conf->dimension_mask << VSYNC_WIDTH_SHIFT);

	mtk_dpi_mask(dpi, porch_addr,

		     sync->back_porch << VSYNC_BACK_PORCH_SHIFT,

		     VSYNC_BACK_PORCH_MASK);

		     dpi->conf->dimension_mask << VSYNC_BACK_PORCH_SHIFT);

	mtk_dpi_mask(dpi, porch_addr,

		     sync->front_porch << VSYNC_FRONT_PORCH_SHIFT,

		     VSYNC_FRONT_PORCH_MASK);

		     dpi->conf->dimension_mask << VSYNC_FRONT_PORCH_SHIFT);

}



static void mtk_dpi_config_vsync_lodd(struct mtk_dpi *dpi,
@@ -808,6 +811,7 @@ static const struct mtk_dpi_conf mt8173_conf = { 
	.num_output_fmts = ARRAY_SIZE(mt8173_output_fmts),

	.is_ck_de_pol = true,

	.swap_input_support = true,

	.dimension_mask = HPW_MASK,

};



static const struct mtk_dpi_conf mt2701_conf = {
@@ -819,6 +823,7 @@ static const struct mtk_dpi_conf mt2701_conf = { 
	.num_output_fmts = ARRAY_SIZE(mt8173_output_fmts),

	.is_ck_de_pol = true,

	.swap_input_support = true,

	.dimension_mask = HPW_MASK,

};



static const struct mtk_dpi_conf mt8183_conf = {
@@ -829,6 +834,7 @@ static const struct mtk_dpi_conf mt8183_conf = { 
	.num_output_fmts = ARRAY_SIZE(mt8183_output_fmts),

	.is_ck_de_pol = true,

	.swap_input_support = true,

	.dimension_mask = HPW_MASK,

};



static const struct mtk_dpi_conf mt8192_conf = {
@@ -839,6 +845,7 @@ static const struct mtk_dpi_conf mt8192_conf = { 
	.num_output_fmts = ARRAY_SIZE(mt8183_output_fmts),

	.is_ck_de_pol = true,

	.swap_input_support = true,

	.dimension_mask = HPW_MASK,

};



static int mtk_dpi_probe(struct platform_device *pdev)