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

drm/mediatek: dpi: Move swap_shift to SoC config 



Add flexibility by moving the swap shift value to SoC specific 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 avatarRex-BC Chen <rex-bc.chen@mediatek.com>
Reviewed-by: default avatarAngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Link: https://patchwork.kernel.org/project/linux-mediatek/patch/20220701035845.16458-11-rex-bc.chen@mediatek.com/


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

drivers/gpu/drm/mediatek/mtk_dpi.c

+9 −1
Original line number Diff line number Diff line
@@ -125,6 +125,7 @@ struct mtk_dpi_yc_limit { 
 * @dimension_mask: Mask used for HWIDTH, HPORCH, VSYNC_WIDTH and VSYNC_PORCH

 *		    (no shift).

 * @hvsize_mask: Mask of HSIZE and VSIZE mask (no shift).

 * @channel_swap_shift: Shift value of channel swap.

 */

struct mtk_dpi_conf {

	unsigned int (*cal_factor)(int clock);
@@ -137,6 +138,7 @@ struct mtk_dpi_conf { 
	bool swap_input_support;

	u32 dimension_mask;

	u32 hvsize_mask;

	u32 channel_swap_shift;

};



static void mtk_dpi_mask(struct mtk_dpi *dpi, u32 offset, u32 val, u32 mask)
@@ -367,7 +369,9 @@ static void mtk_dpi_config_channel_swap(struct mtk_dpi *dpi, 
		break;

	}



	mtk_dpi_mask(dpi, DPI_OUTPUT_SETTING, val << CH_SWAP, CH_SWAP_MASK);

	mtk_dpi_mask(dpi, DPI_OUTPUT_SETTING,

		     val << dpi->conf->channel_swap_shift,

		     CH_SWAP_MASK << dpi->conf->channel_swap_shift);

}



static void mtk_dpi_config_yuv422_enable(struct mtk_dpi *dpi, bool enable)
@@ -817,6 +821,7 @@ static const struct mtk_dpi_conf mt8173_conf = { 
	.swap_input_support = true,

	.dimension_mask = HPW_MASK,

	.hvsize_mask = HSIZE_MASK,

	.channel_swap_shift = CH_SWAP,

};



static const struct mtk_dpi_conf mt2701_conf = {
@@ -830,6 +835,7 @@ static const struct mtk_dpi_conf mt2701_conf = { 
	.swap_input_support = true,

	.dimension_mask = HPW_MASK,

	.hvsize_mask = HSIZE_MASK,

	.channel_swap_shift = CH_SWAP,

};



static const struct mtk_dpi_conf mt8183_conf = {
@@ -842,6 +848,7 @@ static const struct mtk_dpi_conf mt8183_conf = { 
	.swap_input_support = true,

	.dimension_mask = HPW_MASK,

	.hvsize_mask = HSIZE_MASK,

	.channel_swap_shift = CH_SWAP,

};



static const struct mtk_dpi_conf mt8192_conf = {
@@ -854,6 +861,7 @@ static const struct mtk_dpi_conf mt8192_conf = { 
	.swap_input_support = true,

	.dimension_mask = HPW_MASK,

	.hvsize_mask = HSIZE_MASK,

	.channel_swap_shift = CH_SWAP,

};



static int mtk_dpi_probe(struct platform_device *pdev)