drm: sun4i: de2/de3: refactor mixer initialisation

Now that the DE variant can be selected by enum, take the oppportunity
to factor out some common initialisation code to a separate function.

Signed-off-by: Jernej Skrabec <jernej.skrabec@gmail.com>
Signed-off-by: Ryan Walklin <ryan@testtoast.com>
Reviewed-by: Andre Przywara <andre.przywara@arm.com>
Acked-by: Maxime Ripard <mripard@kernel.org>
Reviewed-by: Chen-Yu Tsai <wens@csie.org>
Link: https://lore.kernel.org/r/20250528092431.28825-3-ryan@testtoast.com
Signed-off-by: Maxime Ripard <mripard@kernel.org>

diff --git a/drivers/gpu/drm/sun4i/sun8i_mixer.c b/drivers/gpu/drm/sun4i/sun8i_mixer.c
index f5368761aad94b1cd64625f7d7dffbcc6f3cca70..fd265015349234c59e095636719479f344420797 100644 (file)
--- a/drivers/gpu/drm/sun4i/sun8i_mixer.c
+++ b/drivers/gpu/drm/sun4i/sun8i_mixer.c
@@ -425,6 +425,38 @@ static int sun8i_mixer_of_get_id(struct device_node *node)
        return of_ep.id;
 }
 
+static void sun8i_mixer_init(struct sun8i_mixer *mixer)
+{
+       unsigned int base = sun8i_blender_base(mixer);
+       int plane_cnt, i;
+
+       /* Enable the mixer */
+       regmap_write(mixer->engine.regs, SUN8I_MIXER_GLOBAL_CTL,
+                    SUN8I_MIXER_GLOBAL_CTL_RT_EN);
+
+       /* Set background color to black */
+       regmap_write(mixer->engine.regs, SUN8I_MIXER_BLEND_BKCOLOR(base),
+                    SUN8I_MIXER_BLEND_COLOR_BLACK);
+
+       /*
+        * Set fill color of bottom plane to black. Generally not needed
+        * except when VI plane is at bottom (zpos = 0) and enabled.
+        */
+       regmap_write(mixer->engine.regs, SUN8I_MIXER_BLEND_PIPE_CTL(base),
+                    SUN8I_MIXER_BLEND_PIPE_CTL_FC_EN(0));
+       regmap_write(mixer->engine.regs, SUN8I_MIXER_BLEND_ATTR_FCOLOR(base, 0),
+                    SUN8I_MIXER_BLEND_COLOR_BLACK);
+
+       plane_cnt = mixer->cfg->vi_num + mixer->cfg->ui_num;
+       for (i = 0; i < plane_cnt; i++)
+               regmap_write(mixer->engine.regs,
+                            SUN8I_MIXER_BLEND_MODE(base, i),
+                            SUN8I_MIXER_BLEND_MODE_DEF);
+
+       regmap_update_bits(mixer->engine.regs, SUN8I_MIXER_BLEND_PIPE_CTL(base),
+                          SUN8I_MIXER_BLEND_PIPE_CTL_EN_MSK, 0);
+}
+
 static int sun8i_mixer_bind(struct device *dev, struct device *master,
                              void *data)
 {
@@ -433,8 +465,6 @@ static int sun8i_mixer_bind(struct device *dev, struct device *master,
        struct sun4i_drv *drv = drm->dev_private;
        struct sun8i_mixer *mixer;
        void __iomem *regs;
-       unsigned int base;
-       int plane_cnt;
        int i, ret;
 
        /*
@@ -534,8 +564,6 @@ static int sun8i_mixer_bind(struct device *dev, struct device *master,
 
        list_add_tail(&mixer->engine.list, &drv->engine_list);
 
-       base = sun8i_blender_base(mixer);
-
        /* Reset registers and disable unused sub-engines */
        if (mixer->cfg->de_type == SUN8I_MIXER_DE3) {
                for (i = 0; i < DE3_MIXER_UNIT_SIZE; i += 4)
@@ -551,7 +579,7 @@ static int sun8i_mixer_bind(struct device *dev, struct device *master,
                regmap_write(mixer->engine.regs, SUN50I_MIXER_FMT_EN, 0);
                regmap_write(mixer->engine.regs, SUN50I_MIXER_CDC0_EN, 0);
                regmap_write(mixer->engine.regs, SUN50I_MIXER_CDC1_EN, 0);
-       } else {
+       } else if (mixer->cfg->de_type == SUN8I_MIXER_DE2) {
                for (i = 0; i < DE2_MIXER_UNIT_SIZE; i += 4)
                        regmap_write(mixer->engine.regs, i, 0);
 
@@ -564,31 +592,7 @@ static int sun8i_mixer_bind(struct device *dev, struct device *master,
                regmap_write(mixer->engine.regs, SUN8I_MIXER_DCSC_EN, 0);
        }
 
-       /* Enable the mixer */
-       regmap_write(mixer->engine.regs, SUN8I_MIXER_GLOBAL_CTL,
-                    SUN8I_MIXER_GLOBAL_CTL_RT_EN);
-
-       /* Set background color to black */
-       regmap_write(mixer->engine.regs, SUN8I_MIXER_BLEND_BKCOLOR(base),
-                    SUN8I_MIXER_BLEND_COLOR_BLACK);
-
-       /*
-        * Set fill color of bottom plane to black. Generally not needed
-        * except when VI plane is at bottom (zpos = 0) and enabled.
-        */
-       regmap_write(mixer->engine.regs, SUN8I_MIXER_BLEND_PIPE_CTL(base),
-                    SUN8I_MIXER_BLEND_PIPE_CTL_FC_EN(0));
-       regmap_write(mixer->engine.regs, SUN8I_MIXER_BLEND_ATTR_FCOLOR(base, 0),
-                    SUN8I_MIXER_BLEND_COLOR_BLACK);
-
-       plane_cnt = mixer->cfg->vi_num + mixer->cfg->ui_num;
-       for (i = 0; i < plane_cnt; i++)
-               regmap_write(mixer->engine.regs,
-                            SUN8I_MIXER_BLEND_MODE(base, i),
-                            SUN8I_MIXER_BLEND_MODE_DEF);
-
-       regmap_update_bits(mixer->engine.regs, SUN8I_MIXER_BLEND_PIPE_CTL(base),
-                          SUN8I_MIXER_BLEND_PIPE_CTL_EN_MSK, 0);
+       sun8i_mixer_init(mixer);
 
        return 0;