mirror of
https://github.com/libretro/Lakka-LibreELEC.git
synced 2024-12-15 19:09:46 +00:00
69 lines
2.1 KiB
Diff
69 lines
2.1 KiB
Diff
From 678c304daf5a489a781179b25fe72e4e856d0c6c Mon Sep 17 00:00:00 2001
|
|
From: Jernej Skrabec <jernej.skrabec@gmail.com>
|
|
Date: Sun, 8 Oct 2023 12:48:12 +0200
|
|
Subject: [PATCH 18/23] 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.
|
|
|
|
Signed-off-by: Jernej Skrabec <jernej.skrabec@gmail.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 884abe3cf773..91781b5bbbbc 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 6ee3790a2a81..329e8bf8cd20 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.42.0
|
|
|