target: add support to skip panel configuration in LK
In the current implementation, a valid panel string can be
passed to kernel via command line argument only if the panel
is supported in LK. Add support to pass the panel string to kernel
even in cases where the panel is not supported in LK. Use a panel
lookup table to acquire the correct panel DT string to be passed to
kernel.
Default:
fastboot oem select-display-panel jdi_1080p_video
Skip panel:
fastboot oem select-display-panel jdi_1080p_video:skip
Disable continuous splash:
fastboot oem select-display-panel jdi_1080p_video:disable
Change-Id: Ib5cd01fb591a6b234905bbb505cd2e478200675d
diff --git a/target/apq8084/oem_panel.c b/target/apq8084/oem_panel.c
index 6a3ac0b..72f58ec 100644
--- a/target/apq8084/oem_panel.c
+++ b/target/apq8084/oem_panel.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2013-2014, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2013-2015, The Linux Foundation. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -201,13 +201,13 @@
if (panel_override_id < 0) {
dprintf(CRITICAL, "Not able to search the panel:%s\n",
- panel_name + strspn(panel_name, " "));
+ panel_name);
} else if (panel_override_id < UNKNOWN_PANEL) {
/* panel override using fastboot oem command */
panel_id = panel_override_id;
dprintf(INFO, "OEM panel override:%s\n",
- panel_name + strspn(panel_name, " "));
+ panel_name);
goto panel_init;
}
}
diff --git a/target/apq8084/target_display.c b/target/apq8084/target_display.c
index 9ae3ea1..1b42981 100755
--- a/target/apq8084/target_display.c
+++ b/target/apq8084/target_display.c
@@ -488,14 +488,13 @@
return target_backlight_ctrl(&edp_bklt, enable);
}
-bool target_display_panel_node(char *panel_name, char *pbuf, uint16_t buf_size)
+bool target_display_panel_node(char *pbuf, uint16_t buf_size)
{
int prefix_string_len = strlen(DISPLAY_CMDLINE_PREFIX);
bool ret = true;
+ struct oem_panel_data oem = mdss_dsi_get_oem_data();
- panel_name += strspn(panel_name, " ");
-
- if (!strcmp(panel_name, HDMI_PANEL_NAME)) {
+ if (!strcmp(oem.panel, HDMI_PANEL_NAME)) {
if (buf_size < (prefix_string_len + LK_OVERRIDE_PANEL_LEN +
strlen(HDMI_CONTROLLER_STRING))) {
dprintf(CRITICAL, "command line argument is greater than buffer size\n");
@@ -508,7 +507,7 @@
buf_size -= LK_OVERRIDE_PANEL_LEN;
strlcat(pbuf, HDMI_CONTROLLER_STRING, buf_size);
} else {
- ret = gcdb_display_cmdline_arg(panel_name, pbuf, buf_size);
+ ret = gcdb_display_cmdline_arg(pbuf, buf_size);
}
return ret;
@@ -517,32 +516,33 @@
void target_display_init(const char *panel_name)
{
uint32_t ret = 0;
- char cont_splash = '\0';
+ struct oem_panel_data oem;
- set_panel_cmd_string(panel_name, &cont_splash);
- panel_name += strspn(panel_name, " ");
+ set_panel_cmd_string(panel_name);
+ oem = mdss_dsi_get_oem_data();
- if (!strcmp(panel_name, NO_PANEL_CONFIG)
- || !strcmp(panel_name, SIM_VIDEO_PANEL)
- || !strcmp(panel_name, SIM_DUALDSI_VIDEO_PANEL)
- || !strcmp(panel_name, SIM_CMD_PANEL)
- || !strcmp(panel_name, SIM_DUALDSI_CMD_PANEL)) {
+ if (!strcmp(oem.panel, NO_PANEL_CONFIG)
+ || !strcmp(oem.panel, SIM_VIDEO_PANEL)
+ || !strcmp(oem.panel, SIM_DUALDSI_VIDEO_PANEL)
+ || !strcmp(oem.panel, SIM_CMD_PANEL)
+ || !strcmp(oem.panel, SIM_DUALDSI_CMD_PANEL)
+ || oem.skip) {
dprintf(INFO, "Selected panel: %s\nSkip panel configuration\n",
- panel_name);
+ oem.panel);
return;
- } else if (!strcmp(panel_name, HDMI_PANEL_NAME)) {
+ } else if (!strcmp(oem.panel, HDMI_PANEL_NAME)) {
dprintf(INFO, "%s: HDMI is primary\n", __func__);
mdss_hdmi_display_init(MDP_REV_50, HDMI_FB_ADDR);
return;
}
- ret = gcdb_display_init(panel_name, MDP_REV_50, MIPI_FB_ADDR);
+ ret = gcdb_display_init(oem.panel, MDP_REV_50, MIPI_FB_ADDR);
if (ret) {
target_force_cont_splash_disable(true);
msm_display_off();
}
- if (cont_splash == '0') {
+ if (!oem.cont_splash) {
dprintf(INFO, "Forcing continuous splash disable\n");
target_force_cont_splash_disable(true);
}
diff --git a/target/init.c b/target/init.c
index 9191572..fba226c 100644
--- a/target/init.c
+++ b/target/init.c
@@ -164,8 +164,7 @@
{
}
-__WEAK bool target_display_panel_node(char *panel_name, char *pbuf,
- uint16_t buf_size)
+__WEAK bool target_display_panel_node(char *pbuf, uint16_t buf_size)
{
return false;
}
diff --git a/target/msm8226/oem_panel.c b/target/msm8226/oem_panel.c
index 442fa29..7113c65 100755
--- a/target/msm8226/oem_panel.c
+++ b/target/msm8226/oem_panel.c
@@ -422,13 +422,13 @@
if (panel_override_id < 0) {
dprintf(CRITICAL, "Not able to search the panel:%s\n",
- panel_name + strspn(panel_name, " "));
+ panel_name);
} else if (panel_override_id < UNKNOWN_PANEL) {
/* panel override using fastboot oem command */
panel_id = panel_override_id;
dprintf(INFO, "OEM panel override:%s\n",
- panel_name + strspn(panel_name, " "));
+ panel_name);
goto panel_init;
}
}
diff --git a/target/msm8226/target_display.c b/target/msm8226/target_display.c
index 0bc1173..4d2e513 100755
--- a/target/msm8226/target_display.c
+++ b/target/msm8226/target_display.c
@@ -400,9 +400,9 @@
return NO_ERROR;
}
-bool target_display_panel_node(char *panel_name, char *pbuf, uint16_t buf_size)
+bool target_display_panel_node(char *pbuf, uint16_t buf_size)
{
- return gcdb_display_cmdline_arg(panel_name, pbuf, buf_size);
+ return gcdb_display_cmdline_arg(pbuf, buf_size);
}
void target_display_init(const char *panel_name)
@@ -410,15 +410,17 @@
uint32_t panel_loop = 0;
uint32_t ret = 0;
uint32_t fb_addr = MIPI_FB_ADDR;
- char cont_splash = '\0';
+ struct oem_panel_data oem;
- set_panel_cmd_string(panel_name, &cont_splash);
+ set_panel_cmd_string(panel_name);
+ oem = mdss_dsi_get_oem_data();
- if (!strcmp(panel_name, NO_PANEL_CONFIG)
- || !strcmp(panel_name, SIM_VIDEO_PANEL)
- || !strcmp(panel_name, SIM_CMD_PANEL)) {
+ if (!strcmp(oem.panel, NO_PANEL_CONFIG)
+ || !strcmp(oem.panel, SIM_VIDEO_PANEL)
+ || !strcmp(oem.panel, SIM_CMD_PANEL)
+ || oem.skip) {
dprintf(INFO, "Selected panel: %s\nSkip panel configuration\n",
- panel_name);
+ oem.panel);
return;
}
@@ -427,7 +429,7 @@
do {
target_force_cont_splash_disable(false);
- ret = gcdb_display_init(panel_name, MDP_REV_50, fb_addr);
+ ret = gcdb_display_init(oem.panel, MDP_REV_50, fb_addr);
if (!ret || ret == ERR_NOT_SUPPORTED) {
break;
} else {
@@ -436,7 +438,7 @@
}
} while (++panel_loop <= oem_panel_max_auto_detect_panels());
- if (cont_splash == '0') {
+ if (!oem.cont_splash) {
dprintf(INFO, "Forcing continuous splash disable\n");
target_force_cont_splash_disable(true);
}
diff --git a/target/msm8610/target_display.c b/target/msm8610/target_display.c
index 1213bd3..bcf2285 100755
--- a/target/msm8610/target_display.c
+++ b/target/msm8610/target_display.c
@@ -193,27 +193,29 @@
return NO_ERROR;
}
-bool target_display_panel_node(char *panel_name, char *pbuf, uint16_t buf_size)
+bool target_display_panel_node(char *pbuf, uint16_t buf_size)
{
- return gcdb_display_cmdline_arg(panel_name, pbuf, buf_size);
+ return gcdb_display_cmdline_arg(pbuf, buf_size);
}
void target_display_init(const char *panel_name)
{
uint32_t panel_loop = 0;
uint32_t ret = 0;
- char cont_splash = '\0';
+ struct oem_panel_data oem;
- set_panel_cmd_string(panel_name, &cont_splash);
+ set_panel_cmd_string(panel_name);
+ oem = mdss_dsi_get_oem_data();
- if (!strcmp(panel_name, NO_PANEL_CONFIG)) {
+ if (!strcmp(oem.panel, NO_PANEL_CONFIG)
+ || oem.skip) {
dprintf(INFO, "Skip panel configuration\n");
return;
}
do {
target_force_cont_splash_disable(false);
- ret = gcdb_display_init(panel_name, MDP_REV_304,(void *)MIPI_FB_ADDR);
+ ret = gcdb_display_init(oem.panel, MDP_REV_304,(void *)MIPI_FB_ADDR);
if (ret) {
/*Panel signature did not match, turn off the display*/
target_force_cont_splash_disable(true);
@@ -223,7 +225,7 @@
}
} while (++panel_loop <= (uint32_t)oem_panel_max_auto_detect_panels());
- if (cont_splash == '0') {
+ if (!oem.cont_splash) {
dprintf(INFO, "Forcing continuous splash disable\n");
target_force_cont_splash_disable(true);
}
diff --git a/target/msm8909/oem_panel.c b/target/msm8909/oem_panel.c
index 215a33a..6d84eef 100644
--- a/target/msm8909/oem_panel.c
+++ b/target/msm8909/oem_panel.c
@@ -356,13 +356,13 @@
if (panel_override_id < 0) {
dprintf(CRITICAL, "Not able to search the panel:%s\n",
- panel_name + strspn(panel_name, " "));
+ panel_name);
} else if (panel_override_id < UNKNOWN_PANEL) {
/* panel override using fastboot oem command */
panel_id = panel_override_id;
dprintf(INFO, "OEM panel override:%s\n",
- panel_name + strspn(panel_name, " "));
+ panel_name);
goto panel_init;
}
}
diff --git a/target/msm8909/target_display.c b/target/msm8909/target_display.c
index 9af712e..6a7f3b8 100755
--- a/target/msm8909/target_display.c
+++ b/target/msm8909/target_display.c
@@ -334,31 +334,32 @@
return NO_ERROR;
}
-bool target_display_panel_node(char *panel_name, char *pbuf, uint16_t buf_size)
+bool target_display_panel_node(char *pbuf, uint16_t buf_size)
{
- return gcdb_display_cmdline_arg(panel_name, pbuf, buf_size);
+ return gcdb_display_cmdline_arg(pbuf, buf_size);
}
void target_display_init(const char *panel_name)
{
uint32_t panel_loop = 0;
uint32_t ret = 0;
- char cont_splash = '\0';
+ struct oem_panel_data oem;
- set_panel_cmd_string(panel_name, &cont_splash);
+ set_panel_cmd_string(panel_name);
+ oem = mdss_dsi_get_oem_data();
- panel_name += strspn(panel_name, " ");
- if (!strcmp(panel_name, NO_PANEL_CONFIG)
- || !strcmp(panel_name, SIM_VIDEO_PANEL)
- || !strcmp(panel_name, SIM_CMD_PANEL)) {
+ if (!strcmp(oem.panel, NO_PANEL_CONFIG)
+ || !strcmp(oem.panel, SIM_VIDEO_PANEL)
+ || !strcmp(oem.panel, SIM_CMD_PANEL)
+ || oem.skip) {
dprintf(INFO, "Selected %s: Skip panel configuration\n",
- panel_name);
+ oem.panel);
return;
}
do {
target_force_cont_splash_disable(false);
- ret = gcdb_display_init(panel_name, MDP_REV_305, MIPI_FB_ADDR);
+ ret = gcdb_display_init(oem.panel, MDP_REV_305, MIPI_FB_ADDR);
if (!ret || ret == ERR_NOT_SUPPORTED) {
break;
} else {
@@ -367,7 +368,7 @@
}
} while (++panel_loop <= oem_panel_max_auto_detect_panels());
- if (cont_splash == '0') {
+ if (!oem.cont_splash) {
dprintf(INFO, "Forcing continuous splash disable\n");
target_force_cont_splash_disable(true);
}
diff --git a/target/msm8916/oem_panel.c b/target/msm8916/oem_panel.c
index 0562017..3d57f24 100644
--- a/target/msm8916/oem_panel.c
+++ b/target/msm8916/oem_panel.c
@@ -632,13 +632,13 @@
if (panel_override_id < 0) {
dprintf(CRITICAL, "Not able to search the panel:%s\n",
- panel_name + strspn(panel_name, " "));
+ panel_name);
} else if (panel_override_id < UNKNOWN_PANEL) {
/* panel override using fastboot oem command */
panel_id = panel_override_id;
dprintf(INFO, "OEM panel override:%s\n",
- panel_name + strspn(panel_name, " "));
+ panel_name);
goto panel_init;
}
}
diff --git a/target/msm8916/target_display.c b/target/msm8916/target_display.c
index 56ee921..8a873a5 100644
--- a/target/msm8916/target_display.c
+++ b/target/msm8916/target_display.c
@@ -566,9 +566,9 @@
return NO_ERROR;
}
-bool target_display_panel_node(char *panel_name, char *pbuf, uint16_t buf_size)
+bool target_display_panel_node(char *pbuf, uint16_t buf_size)
{
- return gcdb_display_cmdline_arg(panel_name, pbuf, buf_size);
+ return gcdb_display_cmdline_arg(pbuf, buf_size);
}
void target_set_switch_gpio(int enable_dsi2HdmiBridge)
@@ -589,22 +589,23 @@
{
uint32_t panel_loop = 0;
uint32_t ret = 0;
- char cont_splash = '\0';
+ struct oem_panel_data oem;
- set_panel_cmd_string(panel_name, &cont_splash);
- panel_name += strspn(panel_name, " ");
+ set_panel_cmd_string(panel_name);
+ oem = mdss_dsi_get_oem_data();
- if (!strcmp(panel_name, NO_PANEL_CONFIG)
- || !strcmp(panel_name, SIM_VIDEO_PANEL)
- || !strcmp(panel_name, SIM_CMD_PANEL)) {
+ if (!strcmp(oem.panel, NO_PANEL_CONFIG)
+ || !strcmp(oem.panel, SIM_VIDEO_PANEL)
+ || !strcmp(oem.panel, SIM_CMD_PANEL)
+ || oem.skip) {
dprintf(INFO, "Selected panel: %s\nSkip panel configuration\n",
- panel_name);
+ oem.panel);
return;
}
do {
target_force_cont_splash_disable(false);
- ret = gcdb_display_init(panel_name, MDP_REV_50, MIPI_FB_ADDR);
+ ret = gcdb_display_init(oem.panel, MDP_REV_50, MIPI_FB_ADDR);
if (!ret || ret == ERR_NOT_SUPPORTED) {
break;
} else {
@@ -613,7 +614,7 @@
}
} while (++panel_loop <= oem_panel_max_auto_detect_panels());
- if (cont_splash == '0') {
+ if (!oem.cont_splash) {
dprintf(INFO, "Forcing continuous splash disable\n");
target_force_cont_splash_disable(true);
}
diff --git a/target/msm8952/oem_panel.c b/target/msm8952/oem_panel.c
index b156617..09b767b 100644
--- a/target/msm8952/oem_panel.c
+++ b/target/msm8952/oem_panel.c
@@ -314,13 +314,13 @@
if (panel_override_id < 0) {
dprintf(CRITICAL, "Not able to search the panel:%s\n",
- panel_name + strspn(panel_name, " "));
+ panel_name);
} else if (panel_override_id < UNKNOWN_PANEL) {
/* panel override using fastboot oem command */
panel_id = panel_override_id;
dprintf(INFO, "OEM panel override:%s\n",
- panel_name + strspn(panel_name, " "));
+ panel_name);
goto panel_init;
}
}
diff --git a/target/msm8952/target_display.c b/target/msm8952/target_display.c
index 517de58..e89beb5 100644
--- a/target/msm8952/target_display.c
+++ b/target/msm8952/target_display.c
@@ -514,32 +514,33 @@
return NO_ERROR;
}
-bool target_display_panel_node(char *panel_name, char *pbuf, uint16_t buf_size)
+bool target_display_panel_node(char *pbuf, uint16_t buf_size)
{
- return gcdb_display_cmdline_arg(panel_name, pbuf, buf_size);
+ return gcdb_display_cmdline_arg(pbuf, buf_size);
}
void target_display_init(const char *panel_name)
{
- char cont_splash = '\0';
+ struct oem_panel_data oem;
- set_panel_cmd_string(panel_name, &cont_splash);
- panel_name += strspn(panel_name, " ");
+ set_panel_cmd_string(panel_name);
+ oem = mdss_dsi_get_oem_data();
- if (!strcmp(panel_name, NO_PANEL_CONFIG)
- || !strcmp(panel_name, SIM_VIDEO_PANEL)
- || !strcmp(panel_name, SIM_CMD_PANEL)) {
+ if (!strcmp(oem.panel, NO_PANEL_CONFIG)
+ || !strcmp(oem.panel, SIM_VIDEO_PANEL)
+ || !strcmp(oem.panel, SIM_CMD_PANEL)
+ || oem.skip) {
dprintf(INFO, "Selected panel: %s\nSkip panel configuration\n",
- panel_name);
+ oem.panel);
return;
}
- if (gcdb_display_init(panel_name, MDP_REV_50, (void *)MIPI_FB_ADDR)) {
+ if (gcdb_display_init(oem.panel, MDP_REV_50, (void *)MIPI_FB_ADDR)) {
target_force_cont_splash_disable(true);
msm_display_off();
}
- if (cont_splash == '0') {
+ if (!oem.cont_splash) {
dprintf(INFO, "Forcing continuous splash disable\n");
target_force_cont_splash_disable(true);
}
diff --git a/target/msm8974/oem_panel.c b/target/msm8974/oem_panel.c
index 45b00d9..8544a24 100755
--- a/target/msm8974/oem_panel.c
+++ b/target/msm8974/oem_panel.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2013-2014, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2013-2015, The Linux Foundation. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -293,13 +293,13 @@
if (panel_override_id < 0) {
dprintf(CRITICAL, "Not able to search the panel:%s\n",
- panel_name + strspn(panel_name, " "));
+ panel_name);
} else if (panel_override_id < UNKNOWN_PANEL) {
/* panel override using fastboot oem command */
panel_id = panel_override_id;
dprintf(INFO, "OEM panel override:%s\n",
- panel_name + strspn(panel_name, " "));
+ panel_name);
goto panel_init;
}
}
diff --git a/target/msm8974/target_display.c b/target/msm8974/target_display.c
index eae18f0..adacf1d 100755
--- a/target/msm8974/target_display.c
+++ b/target/msm8974/target_display.c
@@ -392,14 +392,13 @@
return 0;
}
-bool target_display_panel_node(char *panel_name, char *pbuf, uint16_t buf_size)
+bool target_display_panel_node(char *pbuf, uint16_t buf_size)
{
int prefix_string_len = strlen(DISPLAY_CMDLINE_PREFIX);
bool ret = true;
+ struct oem_panel_data oem = mdss_dsi_get_oem_data();
- panel_name += strspn(panel_name, " ");
-
- if (!strcmp(panel_name, HDMI_PANEL_NAME)) {
+ if (!strcmp(oem.panel, HDMI_PANEL_NAME)) {
if (buf_size < (prefix_string_len + LK_OVERRIDE_PANEL_LEN +
strlen(HDMI_CONTROLLER_STRING))) {
dprintf(CRITICAL, "command line argument is greater than buffer size\n");
@@ -412,7 +411,7 @@
buf_size -= LK_OVERRIDE_PANEL_LEN;
strlcat(pbuf, HDMI_CONTROLLER_STRING, buf_size);
} else {
- ret = gcdb_display_cmdline_arg(panel_name, pbuf, buf_size);
+ ret = gcdb_display_cmdline_arg(pbuf, buf_size);
}
return ret;
@@ -423,23 +422,24 @@
uint32_t hw_id = board_hardware_id();
uint32_t panel_loop = 0;
int ret = 0;
- char cont_splash = '\0';
+ struct oem_panel_data oem;
if (target_hw_interposer())
return;
- set_panel_cmd_string(panel_name, &cont_splash);
- panel_name += strspn(panel_name, " ");
+ set_panel_cmd_string(panel_name);
+ oem = mdss_dsi_get_oem_data();
- if (!strcmp(panel_name, NO_PANEL_CONFIG)
- || !strcmp(panel_name, SIM_VIDEO_PANEL)
- || !strcmp(panel_name, SIM_DUALDSI_VIDEO_PANEL)
- || !strcmp(panel_name, SIM_CMD_PANEL)
- || !strcmp(panel_name, SIM_DUALDSI_CMD_PANEL)) {
+ if (!strcmp(oem.panel, NO_PANEL_CONFIG)
+ || !strcmp(oem.panel, SIM_VIDEO_PANEL)
+ || !strcmp(oem.panel, SIM_DUALDSI_VIDEO_PANEL)
+ || !strcmp(oem.panel, SIM_CMD_PANEL)
+ || !strcmp(oem.panel, SIM_DUALDSI_CMD_PANEL)
+ || oem.skip) {
dprintf(INFO, "Selected panel: %s\nSkip panel configuration\n",
- panel_name);
+ oem.panel);
return;
- } else if (!strcmp(panel_name, HDMI_PANEL_NAME)) {
+ } else if (!strcmp(oem.panel, HDMI_PANEL_NAME)) {
dprintf(INFO, "%s: HDMI is primary\n", __func__);
return;
}
@@ -463,7 +463,7 @@
default:
do {
target_force_cont_splash_disable(false);
- ret = gcdb_display_init(panel_name, MDP_REV_50,
+ ret = gcdb_display_init(oem.panel, MDP_REV_50,
(void *)MIPI_FB_ADDR);
if (!ret || ret == ERR_NOT_SUPPORTED) {
break;
@@ -475,7 +475,7 @@
break;
}
- if (cont_splash == '0') {
+ if (!oem.cont_splash) {
dprintf(INFO, "Forcing continuous splash disable\n");
target_force_cont_splash_disable(true);
}
diff --git a/target/msm8994/oem_panel.c b/target/msm8994/oem_panel.c
index 419b4c3..de71ef9 100644
--- a/target/msm8994/oem_panel.c
+++ b/target/msm8994/oem_panel.c
@@ -415,13 +415,13 @@
if (panel_override_id < 0) {
dprintf(CRITICAL, "Not able to search the panel:%s\n",
- panel_name + strspn(panel_name, " "));
+ panel_name);
} else if (panel_override_id < UNKNOWN_PANEL) {
/* panel override using fastboot oem command */
panel_id = panel_override_id;
dprintf(INFO, "OEM panel override:%s\n",
- panel_name + strspn(panel_name, " "));
+ panel_name);
goto panel_init;
}
}
diff --git a/target/msm8994/target_display.c b/target/msm8994/target_display.c
index 2384b1f..8b3b977 100644
--- a/target/msm8994/target_display.c
+++ b/target/msm8994/target_display.c
@@ -600,15 +600,14 @@
return 0;
}
-bool target_display_panel_node(char *panel_name, char *pbuf, uint16_t buf_size)
+bool target_display_panel_node(char *pbuf, uint16_t buf_size)
{
int prefix_string_len = strlen(DISPLAY_CMDLINE_PREFIX);
bool ret = true;
char vic_buf[HDMI_VIC_LEN] = "0";
+ struct oem_panel_data oem = mdss_dsi_get_oem_data();
- panel_name += strspn(panel_name, " ");
-
- if (!strcmp(panel_name, HDMI_PANEL_NAME)) {
+ if (!strcmp(oem.panel, HDMI_PANEL_NAME)) {
if (buf_size < (prefix_string_len + LK_OVERRIDE_PANEL_LEN +
strlen(HDMI_CONTROLLER_STRING))) {
dprintf(CRITICAL, "command line argument is greater than buffer size\n");
@@ -624,7 +623,7 @@
mdss_hdmi_get_vic(vic_buf);
strlcat(pbuf, vic_buf, buf_size);
} else {
- ret = gcdb_display_cmdline_arg(panel_name, pbuf, buf_size);
+ ret = gcdb_display_cmdline_arg(pbuf, buf_size);
}
return ret;
@@ -632,30 +631,32 @@
void target_display_init(const char *panel_name)
{
- char cont_splash = '\0';
+ struct oem_panel_data oem;
- set_panel_cmd_string(panel_name, &cont_splash);
- panel_name += strspn(panel_name, " ");
- if (!strcmp(panel_name, NO_PANEL_CONFIG)
- || !strcmp(panel_name, SIM_VIDEO_PANEL)
- || !strcmp(panel_name, SIM_DUALDSI_VIDEO_PANEL)
- || !strcmp(panel_name, SIM_CMD_PANEL)
- || !strcmp(panel_name, SIM_DUALDSI_CMD_PANEL)) {
+ set_panel_cmd_string(panel_name);
+ oem = mdss_dsi_get_oem_data();
+
+ if (!strcmp(oem.panel, NO_PANEL_CONFIG)
+ || !strcmp(oem.panel, SIM_VIDEO_PANEL)
+ || !strcmp(oem.panel, SIM_DUALDSI_VIDEO_PANEL)
+ || !strcmp(oem.panel, SIM_CMD_PANEL)
+ || !strcmp(oem.panel, SIM_DUALDSI_CMD_PANEL)
+ || oem.skip) {
dprintf(INFO, "Selected panel: %s\nSkip panel configuration\n",
- panel_name);
+ oem.panel);
return;
- } else if (!strcmp(panel_name, HDMI_PANEL_NAME)) {
+ } else if (!strcmp(oem.panel, HDMI_PANEL_NAME)) {
dprintf(INFO, "%s: HDMI is primary\n", __func__);
mdss_hdmi_display_init(MDP_REV_50, (void *) MIPI_FB_ADDR);
return;
}
- if (gcdb_display_init(panel_name, MDP_REV_50, (void *)MIPI_FB_ADDR)) {
+ if (gcdb_display_init(oem.panel, MDP_REV_50, (void *)MIPI_FB_ADDR)) {
target_force_cont_splash_disable(true);
msm_display_off();
}
- if (cont_splash == '0') {
+ if (!oem.cont_splash) {
dprintf(INFO, "Forcing continuous splash disable\n");
target_force_cont_splash_disable(true);
}
diff --git a/target/msm8996/oem_panel.c b/target/msm8996/oem_panel.c
index 785ad9d..654c849 100644
--- a/target/msm8996/oem_panel.c
+++ b/target/msm8996/oem_panel.c
@@ -279,13 +279,13 @@
if (panel_override_id < 0) {
dprintf(CRITICAL, "Not able to search the panel:%s\n",
- panel_name + strspn(panel_name, " "));
+ panel_name);
} else if (panel_override_id < UNKNOWN_PANEL) {
/* panel override using fastboot oem command */
panel_id = panel_override_id;
dprintf(INFO, "OEM panel override:%s\n",
- panel_name + strspn(panel_name, " "));
+ panel_name);
goto panel_init;
}
}
diff --git a/target/msm8996/target_display.c b/target/msm8996/target_display.c
index d555223..e96c79d 100644
--- a/target/msm8996/target_display.c
+++ b/target/msm8996/target_display.c
@@ -463,14 +463,13 @@
return NO_ERROR;
}
-bool target_display_panel_node(char *panel_name, char *pbuf, uint16_t buf_size)
+bool target_display_panel_node(char *pbuf, uint16_t buf_size)
{
int prefix_string_len = strlen(DISPLAY_CMDLINE_PREFIX);
bool ret = true;
+ struct oem_panel_data oem = mdss_dsi_get_oem_data();
- panel_name += strspn(panel_name, " ");
-
- if (!strcmp(panel_name, HDMI_PANEL_NAME)) {
+ if (!strcmp(oem.panel, HDMI_PANEL_NAME)) {
if (buf_size < (prefix_string_len + LK_OVERRIDE_PANEL_LEN +
strlen(HDMI_CONTROLLER_STRING))) {
dprintf(CRITICAL, "command line argument is greater than buffer size\n");
@@ -482,7 +481,7 @@
strlcat(pbuf, LK_OVERRIDE_PANEL, buf_size);
buf_size -= LK_OVERRIDE_PANEL_LEN;
strlcat(pbuf, HDMI_CONTROLLER_STRING, buf_size);
- } else if (!strcmp(panel_name, DSC_CMD_PANEL)) {
+ } else if (!strcmp(oem.panel, DSC_CMD_PANEL)) {
if (buf_size < (prefix_string_len +
strlen(DSC_CMD_PANEL_STRING))) {
dprintf(CRITICAL, "DSC command line argument is greater than buffer size\n");
@@ -492,7 +491,7 @@
buf_size -= prefix_string_len;
pbuf += prefix_string_len;
strlcpy(pbuf, DSC_CMD_PANEL_STRING, buf_size);
- } else if (!strcmp(panel_name, DSC_VID_PANEL)) {
+ } else if (!strcmp(oem.panel, DSC_VID_PANEL)) {
if (buf_size < (prefix_string_len +
strlen(DSC_VID_PANEL_STRING))) {
dprintf(CRITICAL, "DSC command line argument is greater than buffer size\n");
@@ -503,7 +502,7 @@
pbuf += prefix_string_len;
strlcpy(pbuf, DSC_VID_PANEL_STRING, buf_size);
} else {
- ret = gcdb_display_cmdline_arg(panel_name, pbuf, buf_size);
+ ret = gcdb_display_cmdline_arg(pbuf, buf_size);
}
return ret;
@@ -511,30 +510,31 @@
void target_display_init(const char *panel_name)
{
- char cont_splash = '\0';
+ struct oem_panel_data oem;
- set_panel_cmd_string(panel_name, &cont_splash);
- panel_name += strspn(panel_name, " ");
- if (!strcmp(panel_name, NO_PANEL_CONFIG)
- || !strcmp(panel_name, SIM_VIDEO_PANEL)
- || !strcmp(panel_name, SIM_DUALDSI_VIDEO_PANEL)
- || !strcmp(panel_name, SIM_CMD_PANEL)
- || !strcmp(panel_name, SIM_DUALDSI_CMD_PANEL)
- || !strcmp(panel_name, DSC_CMD_PANEL)
- || !strcmp(panel_name, DSC_VID_PANEL)) {
+ set_panel_cmd_string(panel_name);
+ oem = mdss_dsi_get_oem_data();
+ if (!strcmp(oem.panel, NO_PANEL_CONFIG)
+ || !strcmp(oem.panel, SIM_VIDEO_PANEL)
+ || !strcmp(oem.panel, SIM_DUALDSI_VIDEO_PANEL)
+ || !strcmp(oem.panel, SIM_CMD_PANEL)
+ || !strcmp(oem.panel, SIM_DUALDSI_CMD_PANEL)
+ || !strcmp(oem.panel, DSC_CMD_PANEL)
+ || !strcmp(oem.panel, DSC_VID_PANEL)
+ || oem.skip) {
dprintf(INFO, "Selected panel: %s\nSkip panel configuration\n",
- panel_name);
+ oem.panel);
return;
- } else if (!strcmp(panel_name, HDMI_PANEL_NAME)) {
+ } else if (!strcmp(oem.panel, HDMI_PANEL_NAME)) {
return;
}
- if (gcdb_display_init(panel_name, MDP_REV_50, (void *)MIPI_FB_ADDR)) {
+ if (gcdb_display_init(oem.panel, MDP_REV_50, (void *)MIPI_FB_ADDR)) {
target_force_cont_splash_disable(true);
msm_display_off();
}
- if (cont_splash == '0') {
+ if (!oem.cont_splash) {
dprintf(INFO, "Forcing continuous splash disable\n");
target_force_cont_splash_disable(true);
}