75 lines
2.4 KiB
Diff
75 lines
2.4 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Jernej Skrabec <jernej.skrabec@gmail.com>
|
|
Date: Sun, 12 Oct 2025 21:23:03 +0200
|
|
Subject: drm/sun4i: de2: Initialize layer fields earlier
|
|
|
|
drm_universal_plane_init() can already call some callbacks, like
|
|
format_mod_supported, during initialization. Because of that, fields
|
|
should be initialized beforehand.
|
|
|
|
Reviewed-by: Chen-Yu Tsai <wens@csie.org>
|
|
Tested-by: Ryan Walklin <ryan@testtoast.com>
|
|
Signed-off-by: Jernej Skrabec <jernej.skrabec@gmail.com>
|
|
---
|
|
drivers/gpu/drm/sun4i/sun8i_ui_layer.c | 9 +++++----
|
|
drivers/gpu/drm/sun4i/sun8i_vi_layer.c | 9 +++++----
|
|
2 files changed, 10 insertions(+), 8 deletions(-)
|
|
|
|
diff --git a/drivers/gpu/drm/sun4i/sun8i_ui_layer.c b/drivers/gpu/drm/sun4i/sun8i_ui_layer.c
|
|
index 111111111111..222222222222 100644
|
|
--- a/drivers/gpu/drm/sun4i/sun8i_ui_layer.c
|
|
+++ b/drivers/gpu/drm/sun4i/sun8i_ui_layer.c
|
|
@@ -304,6 +304,11 @@ struct sun8i_layer *sun8i_ui_layer_init_one(struct drm_device *drm,
|
|
if (!layer)
|
|
return ERR_PTR(-ENOMEM);
|
|
|
|
+ layer->mixer = mixer;
|
|
+ layer->type = SUN8I_LAYER_TYPE_UI;
|
|
+ layer->channel = channel;
|
|
+ layer->overlay = 0;
|
|
+
|
|
if (index == 0)
|
|
type = DRM_PLANE_TYPE_PRIMARY;
|
|
|
|
@@ -334,10 +339,6 @@ struct sun8i_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->type = SUN8I_LAYER_TYPE_UI;
|
|
- 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 111111111111..222222222222 100644
|
|
--- a/drivers/gpu/drm/sun4i/sun8i_vi_layer.c
|
|
+++ b/drivers/gpu/drm/sun4i/sun8i_vi_layer.c
|
|
@@ -485,6 +485,11 @@ struct sun8i_layer *sun8i_vi_layer_init_one(struct drm_device *drm,
|
|
if (!layer)
|
|
return ERR_PTR(-ENOMEM);
|
|
|
|
+ layer->mixer = mixer;
|
|
+ layer->type = SUN8I_LAYER_TYPE_VI;
|
|
+ layer->channel = index;
|
|
+ layer->overlay = 0;
|
|
+
|
|
if (mixer->cfg->de_type >= SUN8I_MIXER_DE3) {
|
|
formats = sun8i_vi_layer_de3_formats;
|
|
format_count = ARRAY_SIZE(sun8i_vi_layer_de3_formats);
|
|
@@ -543,10 +548,6 @@ struct sun8i_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->type = SUN8I_LAYER_TYPE_VI;
|
|
- layer->channel = index;
|
|
- layer->overlay = 0;
|
|
|
|
return layer;
|
|
}
|
|
--
|
|
Armbian
|
|
|