Add flexibility by moving the hvsize mask to SoC specific config

Signed-off-by: Guillaume Ranquet <granq...@baylibre.com>
Reviewed-by: AngeloGioacchino Del Regno 
<angelogioacchino.delre...@collabora.com>
---
 drivers/gpu/drm/mediatek/mtk_dpi.c | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/mediatek/mtk_dpi.c 
b/drivers/gpu/drm/mediatek/mtk_dpi.c
index bf098f36a466..6eeda222a973 100644
--- a/drivers/gpu/drm/mediatek/mtk_dpi.c
+++ b/drivers/gpu/drm/mediatek/mtk_dpi.c
@@ -129,6 +129,8 @@ struct mtk_dpi_conf {
        bool swap_input_support;
        /* Mask used for HWIDTH, HPORCH, VSYNC_WIDTH and VSYNC_PORCH (no shift) 
*/
        u32 dimension_mask;
+       /* HSIZE and VSIZE mask (no shift) */
+       u32 hvsize_mask;
        const struct mtk_dpi_yc_limit *limit;
 };
 
@@ -243,8 +245,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)
 {
-       mtk_dpi_mask(dpi, DPI_SIZE, width << HSIZE, HSIZE_MASK);
-       mtk_dpi_mask(dpi, DPI_SIZE, height << VSIZE, VSIZE_MASK);
+       mtk_dpi_mask(dpi, DPI_SIZE, width << HSIZE,
+                    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)
@@ -816,6 +820,7 @@ static const struct mtk_dpi_conf mt8173_conf = {
        .is_ck_de_pol = true,
        .swap_input_support = true,
        .dimension_mask = HPW_MASK,
+       .hvsize_mask = HSIZE_MASK,
        .limit = &mtk_dpi_limit,
 };
 
@@ -829,6 +834,7 @@ static const struct mtk_dpi_conf mt2701_conf = {
        .is_ck_de_pol = true,
        .swap_input_support = true,
        .dimension_mask = HPW_MASK,
+       .hvsize_mask = HSIZE_MASK,
        .limit = &mtk_dpi_limit,
 };
 
@@ -841,6 +847,7 @@ static const struct mtk_dpi_conf mt8183_conf = {
        .is_ck_de_pol = true,
        .swap_input_support = true,
        .dimension_mask = HPW_MASK,
+       .hvsize_mask = HSIZE_MASK,
        .limit = &mtk_dpi_limit,
 };
 
@@ -853,6 +860,7 @@ static const struct mtk_dpi_conf mt8192_conf = {
        .is_ck_de_pol = true,
        .swap_input_support = true,
        .dimension_mask = HPW_MASK,
+       .hvsize_mask = HSIZE_MASK,
        .limit = &mtk_dpi_limit,
 };
 
-- 
2.34.1

Reply via email to