[PATCH 04/23] drm: sun4i: de2: Initialize layer fields earlier

[Ryan Walklin]

From: Jernej Skrabec <jernej.skra...@gmail.com>

drm_universal_plane_init() can already call some callbacks, like
format_mod_supported, during initialization. Because of that, fields
should be initialized beforehand.

Signed-off-by: Jernej Skrabec <jernej.skra...@gmail.com>
Co-developed-by: Ryan Walklin <r...@testtoast.com>
Signed-off-by: Ryan Walklin <r...@testtoast.com>
---
 drivers/gpu/drm/sun4i/sun8i_ui_layer.c | 7 ++++---
 drivers/gpu/drm/sun4i/sun8i_vi_layer.c | 7 ++++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/drivers/gpu/drm/sun4i/sun8i_ui_layer.c 
b/drivers/gpu/drm/sun4i/sun8i_ui_layer.c
index 884abe3cf773a..91781b5bbbbce 100644
--- a/drivers/gpu/drm/sun4i/sun8i_ui_layer.c
+++ b/drivers/gpu/drm/sun4i/sun8i_ui_layer.c
@@ -365,6 +365,10 @@ struct sun8i_ui_layer *sun8i_ui_layer_init_one(struct 
drm_device *drm,
        if (!layer)
                return ERR_PTR(-ENOMEM);
 
+       layer->mixer = mixer;
+       layer->channel = channel;
+       layer->overlay = 0;
+
        if (index == 0)
                type = DRM_PLANE_TYPE_PRIMARY;
 
@@ -395,9 +399,6 @@ struct sun8i_ui_layer *sun8i_ui_layer_init_one(struct 
drm_device *drm,
        }
 
        drm_plane_helper_add(&layer->plane, &sun8i_ui_layer_helper_funcs);
-       layer->mixer = mixer;
-       layer->channel = channel;
-       layer->overlay = 0;
 
        return layer;
 }
diff --git a/drivers/gpu/drm/sun4i/sun8i_vi_layer.c 
b/drivers/gpu/drm/sun4i/sun8i_vi_layer.c
index 6ee3790a2a812..329e8bf8cd20d 100644
--- a/drivers/gpu/drm/sun4i/sun8i_vi_layer.c
+++ b/drivers/gpu/drm/sun4i/sun8i_vi_layer.c
@@ -549,6 +549,10 @@ struct sun8i_vi_layer *sun8i_vi_layer_init_one(struct 
drm_device *drm,
        if (!layer)
                return ERR_PTR(-ENOMEM);
 
+       layer->mixer = mixer;
+       layer->channel = index;
+       layer->overlay = 0;
+
        if (mixer->cfg->is_de3) {
                formats = sun8i_vi_layer_de3_formats;
                format_count = ARRAY_SIZE(sun8i_vi_layer_de3_formats);
@@ -607,9 +611,6 @@ struct sun8i_vi_layer *sun8i_vi_layer_init_one(struct 
drm_device *drm,
        }
 
        drm_plane_helper_add(&layer->plane, &sun8i_vi_layer_helper_funcs);
-       layer->mixer = mixer;
-       layer->channel = index;
-       layer->overlay = 0;
 
        return layer;
 }
-- 
2.45.2