Commit e373924d authored by Guillaume Ranquet's avatar Guillaume Ranquet Committed by Chun-Kuang Hu

drm/mediatek: dpi: Move hvsize_mask to SoC config

Add flexibility by moving the hvsize mask 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 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-10-rex-bc.chen@mediatek.com/Signed-off-by: default avatarChun-Kuang Hu <chunkuang.hu@kernel.org>
parent a519e22b
...@@ -124,6 +124,7 @@ struct mtk_dpi_yc_limit { ...@@ -124,6 +124,7 @@ struct mtk_dpi_yc_limit {
* @swap_input_support: Support input swap function. * @swap_input_support: Support input swap function.
* @dimension_mask: Mask used for HWIDTH, HPORCH, VSYNC_WIDTH and VSYNC_PORCH * @dimension_mask: Mask used for HWIDTH, HPORCH, VSYNC_WIDTH and VSYNC_PORCH
* (no shift). * (no shift).
* @hvsize_mask: Mask of HSIZE and VSIZE mask (no shift).
*/ */
struct mtk_dpi_conf { struct mtk_dpi_conf {
unsigned int (*cal_factor)(int clock); unsigned int (*cal_factor)(int clock);
...@@ -135,6 +136,7 @@ struct mtk_dpi_conf { ...@@ -135,6 +136,7 @@ struct mtk_dpi_conf {
bool is_ck_de_pol; bool is_ck_de_pol;
bool swap_input_support; bool swap_input_support;
u32 dimension_mask; u32 dimension_mask;
u32 hvsize_mask;
}; };
static void mtk_dpi_mask(struct mtk_dpi *dpi, u32 offset, u32 val, u32 mask) static void mtk_dpi_mask(struct mtk_dpi *dpi, u32 offset, u32 val, u32 mask)
...@@ -248,8 +250,10 @@ static void mtk_dpi_config_interface(struct mtk_dpi *dpi, bool inter) ...@@ -248,8 +250,10 @@ static void mtk_dpi_config_interface(struct mtk_dpi *dpi, bool inter)
static void mtk_dpi_config_fb_size(struct mtk_dpi *dpi, u32 width, u32 height) static void mtk_dpi_config_fb_size(struct mtk_dpi *dpi, u32 width, u32 height)
{ {
mtk_dpi_mask(dpi, DPI_SIZE, width << HSIZE, HSIZE_MASK); mtk_dpi_mask(dpi, DPI_SIZE, width << HSIZE,
mtk_dpi_mask(dpi, DPI_SIZE, height << VSIZE, VSIZE_MASK); dpi->conf->hvsize_mask << HSIZE);
mtk_dpi_mask(dpi, DPI_SIZE, height << VSIZE,
dpi->conf->hvsize_mask << VSIZE);
} }
static void mtk_dpi_config_channel_limit(struct mtk_dpi *dpi) static void mtk_dpi_config_channel_limit(struct mtk_dpi *dpi)
...@@ -812,6 +816,7 @@ static const struct mtk_dpi_conf mt8173_conf = { ...@@ -812,6 +816,7 @@ static const struct mtk_dpi_conf mt8173_conf = {
.is_ck_de_pol = true, .is_ck_de_pol = true,
.swap_input_support = true, .swap_input_support = true,
.dimension_mask = HPW_MASK, .dimension_mask = HPW_MASK,
.hvsize_mask = HSIZE_MASK,
}; };
static const struct mtk_dpi_conf mt2701_conf = { static const struct mtk_dpi_conf mt2701_conf = {
...@@ -824,6 +829,7 @@ static const struct mtk_dpi_conf mt2701_conf = { ...@@ -824,6 +829,7 @@ static const struct mtk_dpi_conf mt2701_conf = {
.is_ck_de_pol = true, .is_ck_de_pol = true,
.swap_input_support = true, .swap_input_support = true,
.dimension_mask = HPW_MASK, .dimension_mask = HPW_MASK,
.hvsize_mask = HSIZE_MASK,
}; };
static const struct mtk_dpi_conf mt8183_conf = { static const struct mtk_dpi_conf mt8183_conf = {
...@@ -835,6 +841,7 @@ static const struct mtk_dpi_conf mt8183_conf = { ...@@ -835,6 +841,7 @@ static const struct mtk_dpi_conf mt8183_conf = {
.is_ck_de_pol = true, .is_ck_de_pol = true,
.swap_input_support = true, .swap_input_support = true,
.dimension_mask = HPW_MASK, .dimension_mask = HPW_MASK,
.hvsize_mask = HSIZE_MASK,
}; };
static const struct mtk_dpi_conf mt8192_conf = { static const struct mtk_dpi_conf mt8192_conf = {
...@@ -846,6 +853,7 @@ static const struct mtk_dpi_conf mt8192_conf = { ...@@ -846,6 +853,7 @@ static const struct mtk_dpi_conf mt8192_conf = {
.is_ck_de_pol = true, .is_ck_de_pol = true,
.swap_input_support = true, .swap_input_support = true,
.dimension_mask = HPW_MASK, .dimension_mask = HPW_MASK,
.hvsize_mask = HSIZE_MASK,
}; };
static int mtk_dpi_probe(struct platform_device *pdev) static int mtk_dpi_probe(struct platform_device *pdev)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment