mirror of
https://github.com/libretro/Lakka-LibreELEC.git
synced 2025-03-02 20:05:55 +00:00
33b0203020
The following changes were introduced in 6.11-rc1 and 6.11-rc7 only pass 3 variables to - of: remove internal arguments from of_property_for_each_u32() -9722c3b66e6.11-rc7 has refactored drm9da7ec9b19resulting in the following compile error. build.LibreELEC-H6.aarch64-13.0-devel/toolchain/bin/aarch64-libreelec-linux-gnu-ld: drivers/gpu/drm/sun4i/sun8i_dw_hdmi.o: in function `sun8i_dw_hdmi_bind': build.LibreELEC-H6.aarch64-13.0-devel/build/linux-6.11-rc7/drivers/gpu/drm/sun4i/sun8i_dw_hdmi.c:394:(.text+0x73c): undefined reference to `drm_bridge_connector_init' Co-authored-by: Jernej Skrabec <jernej.skrabec@gmail.com>
73 lines
2.3 KiB
Diff
73 lines
2.3 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
|
|
@@ -295,6 +295,11 @@ struct sun8i_ui_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;
|
|
|
|
@@ -325,10 +330,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->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 6ee3790a2a81..329e8bf8cd20 100644
|
|
--- a/drivers/gpu/drm/sun4i/sun8i_vi_layer.c
|
|
+++ b/drivers/gpu/drm/sun4i/sun8i_vi_layer.c
|
|
@@ -478,6 +478,11 @@ struct sun8i_vi_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->is_de3) {
|
|
formats = sun8i_vi_layer_de3_formats;
|
|
format_count = ARRAY_SIZE(sun8i_vi_layer_de3_formats);
|
|
@@ -543,10 +549,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->type = SUN8I_LAYER_TYPE_VI;
|
|
- layer->channel = index;
|
|
- layer->overlay = 0;
|
|
|
|
return layer;
|
|
}
|
|
--
|
|
2.42.0
|
|
|