lk2nd: device: Set panel name early if known at compile time

Since lk2nd_init() runs before display initialization nowadays, we need to
set the panel name early for the lk1st case to make panel detection (for
booting Linux later) work correctly. This is not a big problem, since lk1st
does not support detecting panels dynamically currently, so we already know
the panel name at compile time.

Author: stephan-gh

lk2nd/device/device.c

@@ -9,6 +9,7 @@
 #include <libfdt.h>
 #include <lk2nd/device.h>
 #include <lk2nd/init.h>
+#include <lk2nd/panel.h>
 #include <lk2nd/util/lkfdt.h>
 
 #include "device.h"
@@ -157,6 +158,9 @@ static void lk2nd_device_init(void)
 #ifdef LK2ND_COMPATIBLE
 	lk2nd_dev.compatible = LK2ND_COMPATIBLE;
 #endif
+#ifdef LK2ND_DISPLAY
+	lk2nd_dev.panel.name = lk2nd_oem_panel_name();
+#endif
 
 	dtb = lk2nd_device2nd_init();
 #ifdef LK2ND_BUNDLE_DTB

lk2nd/display/panel/oem_panel.c

@@ -9,9 +9,9 @@
 #include <panel.h>
 #include <panel_display.h>
 
-#include "generated/panels.h"
+#include <lk2nd/panel.h>
 
-#include "../../device/device.h"
+#include "generated/panels.h"
 
 #if TARGET_MSM8916
 uint32_t panel_regulator_settings[] = {
@@ -42,12 +42,20 @@ uint32_t oem_panel_max_auto_detect_panels()
 #define _panel_select(panel)	panel_##panel##_select
 #define panel_select(panel)	_panel_select(panel)
 
+const char *lk2nd_oem_panel_name(void)
+{
+	struct panel_struct panel;
+	struct msm_panel_info pinfo;
+	struct mdss_dsi_phy_ctrl phy_db;
+
+	panel_select(LK2ND_DISPLAY)(&panel, &pinfo, &phy_db);
+	return panel.paneldata->panel_node_id;
+}
+
 int oem_panel_select(const char *panel_name, struct panel_struct *panel,
 		     struct msm_panel_info *pinfo, struct mdss_dsi_phy_ctrl *phy_db)
 {
 	panel_select(LK2ND_DISPLAY)(panel, pinfo, phy_db);
-	lk2nd_dev.panel.name = panel->paneldata->panel_node_id;
-
 
 #if TARGET_MSM8916
 	if (phy_db->regulator_mode == DSI_PHY_REGULATOR_LDO_MODE)

lk2nd/include/lk2nd/panel.h

@@ -0,0 +1,7 @@
+/* SPDX-License-Identifier: BSD-3-Clause */
+#ifndef LK2ND_PANEL_H
+#define LK2ND_PANEL_H
+
+const char *lk2nd_oem_panel_name(void);
+
+#endif /* LK2ND_PANEL_H */