msm_fb: display: Add boot param LCDC/MIPI panel detection support
Add boot param LCDC/MIPI panel detection support for automatically
loading selected panels through fastboot command
Signed-off-by: Ravishangar Kalyanam <rkalya@codeaurora.org>
diff --git a/drivers/video/msm/Kconfig b/drivers/video/msm/Kconfig
index ddc26b1..cc81d93 100644
--- a/drivers/video/msm/Kconfig
+++ b/drivers/video/msm/Kconfig
@@ -386,6 +386,7 @@
config FB_MSM_MIPI_PANEL_DETECT
bool "MIPI Panel Detect"
+ select FB_MSM_MIPI_TOSHIBA_VIDEO_WVGA_PT
select FB_MSM_MIPI_TOSHIBA_VIDEO_WSVGA_PT
select FB_MSM_MIPI_RENESAS_VIDEO_FWVGA_PT
select FB_MSM_MIPI_RENESAS_CMD_FWVGA_PT
@@ -412,6 +413,22 @@
---help---
Support for LCDC panel auto detect
+config FB_MSM_LCDC_MIPI_PANEL_AUTO_DETECT
+ bool "LCDC + MIPI Panel Auto Detect"
+ select FB_MSM_LCDC_AUTO_DETECT
+ select FB_MSM_LCDC_SAMSUNG_WSVGA
+ select FB_MSM_LCDC_AUO_WVGA
+ select FB_MSM_LCDC_SAMSUNG_OLED_PT
+ select FB_MSM_MIPI_TOSHIBA_VIDEO_WVGA_PT
+ select FB_MSM_MIPI_TOSHIBA_VIDEO_WSVGA_PT
+ select FB_MSM_MIPI_RENESAS_VIDEO_FWVGA_PT
+ select FB_MSM_MIPI_RENESAS_CMD_FWVGA_PT
+ select FB_MSM_MIPI_NOVATEK_VIDEO_QHD_PT
+ select FB_MSM_MIPI_NOVATEK_CMD_QHD_PT
+ select FB_MSM_MIPI_SIMULATOR_VIDEO
+ ---help---
+ Support for LCDC + MIPI panel auto detect
+
config FB_MSM_MDDI_PRISM_WVGA
bool "MDDI Prism WVGA Panel"
select FB_MSM_MDDI
diff --git a/drivers/video/msm/Makefile b/drivers/video/msm/Makefile
index dffde1b..3e89f0b 100644
--- a/drivers/video/msm/Makefile
+++ b/drivers/video/msm/Makefile
@@ -107,12 +107,6 @@
obj-$(CONFIG_FB_MSM_MDDI_QUICKVX) += mddi_quickvx.o
endif
-ifeq ($(CONFIG_FB_MSM_MIPI_PANEL_DETECT),y)
-obj-y += mipi_toshiba_video_wvga_pt.o mipi_toshiba_video_wsvga_pt.o
-obj-y += mipi_novatek_video_qhd_pt.o mipi_novatek_cmd_qhd_pt.o
-obj-y += mipi_renesas_video_fwvga_pt.o mipi_renesas_cmd_fwvga_pt.o
-obj-y += mipi_chimei_wxga_pt.o
-else
obj-$(CONFIG_FB_MSM_MIPI_TOSHIBA_VIDEO_WVGA_PT) += mipi_toshiba_video_wvga_pt.o
obj-$(CONFIG_FB_MSM_MIPI_TOSHIBA_VIDEO_WSVGA_PT) += mipi_toshiba_video_wsvga_pt.o
obj-$(CONFIG_FB_MSM_MIPI_NOVATEK_VIDEO_QHD_PT) += mipi_novatek_video_qhd_pt.o
@@ -121,7 +115,6 @@
obj-$(CONFIG_FB_MSM_MIPI_RENESAS_CMD_FWVGA_PT) += mipi_renesas_cmd_fwvga_pt.o
obj-$(CONFIG_FB_MSM_MIPI_SIMULATOR_VIDEO) += mipi_simulator_video.o
obj-$(CONFIG_FB_MSM_MIPI_CHIMEI_WXGA) += mipi_chimei_wxga_pt.o
-endif
obj-$(CONFIG_FB_MSM_LCDC_PANEL) += lcdc_panel.o
obj-$(CONFIG_FB_MSM_LCDC_PRISM_WVGA) += lcdc_prism.o
diff --git a/drivers/video/msm/hdmi_msm.c b/drivers/video/msm/hdmi_msm.c
index b9d8171..fe3c614 100644
--- a/drivers/video/msm/hdmi_msm.c
+++ b/drivers/video/msm/hdmi_msm.c
@@ -3668,6 +3668,9 @@
{
int rc;
+ if (msm_fb_detect_client("hdmi_msm"))
+ return 0;
+
hdmi_msm_setup_video_mode_lut();
hdmi_msm_state = kzalloc(sizeof(*hdmi_msm_state), GFP_KERNEL);
if (!hdmi_msm_state) {
diff --git a/drivers/video/msm/lcdc_auo_wvga.c b/drivers/video/msm/lcdc_auo_wvga.c
index b1c3af0..6b0733f 100644
--- a/drivers/video/msm/lcdc_auo_wvga.c
+++ b/drivers/video/msm/lcdc_auo_wvga.c
@@ -335,12 +335,10 @@
int ret;
struct msm_panel_info *pinfo;
-#ifdef CONFIG_FB_MSM_LCDC_AUTO_DETECT
if (msm_fb_detect_client(LCDC_AUO_PANEL_NAME)) {
pr_err("%s: detect failed\n", __func__);
return 0;
}
-#endif
ret = platform_driver_register(&this_driver);
if (ret) {
diff --git a/drivers/video/msm/lcdc_chimei_wxga.c b/drivers/video/msm/lcdc_chimei_wxga.c
index b5cce2c..7453ecb 100644
--- a/drivers/video/msm/lcdc_chimei_wxga.c
+++ b/drivers/video/msm/lcdc_chimei_wxga.c
@@ -187,10 +187,8 @@
int ret;
struct msm_panel_info *pinfo;
-#ifdef CONFIG_FB_MSM_MIPI_PANEL_DETECT
- if (msm_fb_detect_client("lcdc_chimei_lvds_wxga"))
+ if (msm_fb_detect_client("lcdc_chimei_wxga"))
return 0;
-#endif
ret = platform_driver_register(&this_driver);
if (ret)
diff --git a/drivers/video/msm/lcdc_samsung_oled_pt.c b/drivers/video/msm/lcdc_samsung_oled_pt.c
index dccc997..16790f3 100644
--- a/drivers/video/msm/lcdc_samsung_oled_pt.c
+++ b/drivers/video/msm/lcdc_samsung_oled_pt.c
@@ -551,12 +551,10 @@
{
int ret;
-#ifdef CONFIG_FB_MSM_LCDC_AUTO_DETECT
if (msm_fb_detect_client("lcdc_samsung_oled")) {
pr_err("%s: detect failed\n", __func__);
return 0;
}
-#endif
ret = platform_driver_register(&this_driver);
if (ret) {
diff --git a/drivers/video/msm/lcdc_samsung_wsvga.c b/drivers/video/msm/lcdc_samsung_wsvga.c
index b4bf8cf..6b35e52 100644
--- a/drivers/video/msm/lcdc_samsung_wsvga.c
+++ b/drivers/video/msm/lcdc_samsung_wsvga.c
@@ -48,12 +48,12 @@
static void lcdc_samsung_panel_set_backlight(struct msm_fb_data_type *mfd)
{
+#ifdef CONFIG_PMIC8058_PWM
int bl_level;
int ret;
bl_level = mfd->bl_level;
-#ifdef CONFIG_PMIC8058_PWM
if (bl_pwm0) {
ret = pwm_config(bl_pwm0, PWM_DUTY_LEVEL * bl_level,
PWM_PERIOD_USEC);
@@ -222,10 +222,8 @@
int ret;
struct msm_panel_info *pinfo;
-#ifdef CONFIG_FB_MSM_LCDC_AUTO_DETECT
if (msm_fb_detect_client("lcdc_samsung_wsvga"))
return 0;
-#endif
ret = platform_driver_register(&this_driver);
if (ret)
diff --git a/drivers/video/msm/mipi_chimei_wxga_pt.c b/drivers/video/msm/mipi_chimei_wxga_pt.c
index f070466..6ac04f5 100644
--- a/drivers/video/msm/mipi_chimei_wxga_pt.c
+++ b/drivers/video/msm/mipi_chimei_wxga_pt.c
@@ -126,10 +126,8 @@
pr_info("mipi-dsi chimei wxga (1366x768) driver ver 1.0.\n");
-#ifdef CONFIG_FB_MSM_MIPI_PANEL_DETECT
- if (msm_fb_detect_client("mipi_chimei_wxga"))
+ if (msm_fb_detect_client("mipi_video_chimei_wxga"))
return 0;
-#endif
/* Landscape */
pinfo->xres = 1366;
diff --git a/drivers/video/msm/mipi_dsi.h b/drivers/video/msm/mipi_dsi.h
index 9f6ea7d..14d6bd9 100644
--- a/drivers/video/msm/mipi_dsi.h
+++ b/drivers/video/msm/mipi_dsi.h
@@ -47,9 +47,10 @@
#define MIPI_DSI_PANEL_WVGA 1
#define MIPI_DSI_PANEL_WVGA_PT 2
#define MIPI_DSI_PANEL_FWVGA_PT 3
-#define MIPI_DSI_PANEL_WXGA 4
-
-#define DSI_PANEL_MAX 4
+#define MIPI_DSI_PANEL_WSVGA_PT 4
+#define MIPI_DSI_PANEL_QHD_PT 5
+#define MIPI_DSI_PANEL_WXGA 6
+#define DSI_PANEL_MAX 6
enum { /* mipi dsi panel */
DSI_VIDEO_MODE,
diff --git a/drivers/video/msm/mipi_novatek_cmd_qhd_pt.c b/drivers/video/msm/mipi_novatek_cmd_qhd_pt.c
index aaf86ae..e7b4f04 100644
--- a/drivers/video/msm/mipi_novatek_cmd_qhd_pt.c
+++ b/drivers/video/msm/mipi_novatek_cmd_qhd_pt.c
@@ -39,10 +39,8 @@
{
int ret;
-#ifdef CONFIG_FB_MSM_MIPI_PANEL_DETECT
if (msm_fb_detect_client("mipi_cmd_novatek_qhd"))
return 0;
-#endif
pinfo.xres = 540;
pinfo.yres = 960;
diff --git a/drivers/video/msm/mipi_novatek_video_qhd_pt.c b/drivers/video/msm/mipi_novatek_video_qhd_pt.c
index 635b66e..7f9e777 100644
--- a/drivers/video/msm/mipi_novatek_video_qhd_pt.c
+++ b/drivers/video/msm/mipi_novatek_video_qhd_pt.c
@@ -39,10 +39,8 @@
{
int ret;
-#ifdef CONFIG_FB_MSM_MIPI_PANEL_DETECT
if (msm_fb_detect_client("mipi_video_novatek_qhd"))
return 0;
-#endif
pinfo.xres = 540;
pinfo.yres = 960;
diff --git a/drivers/video/msm/mipi_renesas_cmd_fwvga_pt.c b/drivers/video/msm/mipi_renesas_cmd_fwvga_pt.c
index 796fbd2..7f5ac70 100644
--- a/drivers/video/msm/mipi_renesas_cmd_fwvga_pt.c
+++ b/drivers/video/msm/mipi_renesas_cmd_fwvga_pt.c
@@ -57,10 +57,8 @@
{
int ret;
-#ifdef CONFIG_FB_MSM_MIPI_PANEL_DETECT
if (msm_fb_detect_client("mipi_cmd_renesas_fwvga"))
return 0;
-#endif
pinfo.xres = 480;
pinfo.yres = 864;
diff --git a/drivers/video/msm/mipi_renesas_video_fwvga_pt.c b/drivers/video/msm/mipi_renesas_video_fwvga_pt.c
index 0e49011..e826773 100644
--- a/drivers/video/msm/mipi_renesas_video_fwvga_pt.c
+++ b/drivers/video/msm/mipi_renesas_video_fwvga_pt.c
@@ -59,10 +59,8 @@
{
int ret;
-#ifdef CONFIG_FB_MSM_MIPI_PANEL_DETECT
if (msm_fb_detect_client("mipi_video_renesas_fwvga"))
return 0;
-#endif
pinfo.xres = 480;
pinfo.yres = 864;
diff --git a/drivers/video/msm/mipi_simulator_video.c b/drivers/video/msm/mipi_simulator_video.c
index 8795554..d622819 100644
--- a/drivers/video/msm/mipi_simulator_video.c
+++ b/drivers/video/msm/mipi_simulator_video.c
@@ -31,10 +31,8 @@
{
int ret;
-#ifdef CONFIG_FB_MSM_MIPI_PANEL_DETECT
- if (msm_fb_detect_client("mipi_video_simulator"))
+ if (msm_fb_detect_client("mipi_video_simulator_vga"))
return 0;
-#endif
pinfo.xres = 640;
pinfo.yres = 480;
pinfo.type = MIPI_VIDEO_PANEL;
diff --git a/drivers/video/msm/mipi_toshiba.c b/drivers/video/msm/mipi_toshiba.c
index 9e5d06a..acbb2f0 100644
--- a/drivers/video/msm/mipi_toshiba.c
+++ b/drivers/video/msm/mipi_toshiba.c
@@ -18,6 +18,7 @@
static struct pwm_device *bl_lpm;
static struct mipi_dsi_panel_platform_data *mipi_toshiba_pdata;
+#define TM_GET_PID(id) (((id) & 0xff00)>>8)
static struct dsi_buf toshiba_tx_buf;
static struct dsi_buf toshiba_rx_buf;
@@ -37,7 +38,6 @@
static char display_off[2] = {0x28, 0x00};
static char enter_sleep[2] = {0x10, 0x00};
-#ifdef CONFIG_FB_MSM_MIPI_TOSHIBA_VIDEO_WVGA_PT
static char mcap_off[2] = {0xb2, 0x00};
static char ena_test_reg[3] = {0xEF, 0x01, 0x01};
static char two_lane[3] = {0xEF, 0x60, 0x63};
@@ -49,7 +49,7 @@
static char hor_addr_2B_wvga[5] = {0x2B, 0x00, 0x00, 0x03, 0x55};
static char if_sel_video[2] = {0x53, 0x01};
-static struct dsi_cmd_desc toshiba_display_on_cmds[] = {
+static struct dsi_cmd_desc toshiba_wvga_display_on_cmds[] = {
{DTYPE_GEN_LWRITE, 1, 0, 0, 0, sizeof(mcap_off), mcap_off},
{DTYPE_GEN_LWRITE, 1, 0, 0, 0, sizeof(ena_test_reg), ena_test_reg},
{DTYPE_GEN_LWRITE, 1, 0, 0, 0, sizeof(two_lane), two_lane},
@@ -69,9 +69,6 @@
{DTYPE_DCS_WRITE, 1, 0, 0, 0, sizeof(display_on), display_on}
};
-#endif
-
-#ifdef CONFIG_FB_MSM_MIPI_TOSHIBA_VIDEO_WSVGA_PT
static char mcap_start[2] = {0xb0, 0x04};
static char num_out_pixelform[3] = {0xb3, 0x00, 0x87};
static char dsi_ctrl[3] = {0xb6, 0x30, 0x83};
@@ -135,7 +132,7 @@
static char set_pixel_format[2] = {0x3a, 0x70};
-static struct dsi_cmd_desc toshiba_display_on_cmds[] = {
+static struct dsi_cmd_desc toshiba_wsvga_display_on_cmds[] = {
{DTYPE_GEN_WRITE2, 1, 0, 0, 10, sizeof(mcap_start), mcap_start},
{DTYPE_GEN_LWRITE, 1, 0, 0, 10, sizeof(num_out_pixelform),
num_out_pixelform},
@@ -177,7 +174,6 @@
{DTYPE_DCS_WRITE, 1, 0, 0, 120, sizeof(exit_sleep), exit_sleep},
{DTYPE_DCS_WRITE, 1, 0, 0, 50, sizeof(display_on), display_on}
};
-#endif
static struct dsi_cmd_desc toshiba_display_off_cmds[] = {
{DTYPE_DCS_WRITE, 1, 0, 0, 50, sizeof(display_off), display_off},
@@ -195,8 +191,16 @@
if (mfd->key != MFD_KEY)
return -EINVAL;
- mipi_dsi_cmds_tx(mfd, &toshiba_tx_buf, toshiba_display_on_cmds,
- ARRAY_SIZE(toshiba_display_on_cmds));
+ if (TM_GET_PID(mfd->panel.id) == MIPI_DSI_PANEL_WVGA_PT)
+ mipi_dsi_cmds_tx(mfd, &toshiba_tx_buf,
+ toshiba_wvga_display_on_cmds,
+ ARRAY_SIZE(toshiba_wvga_display_on_cmds));
+ else if (TM_GET_PID(mfd->panel.id) == MIPI_DSI_PANEL_WSVGA_PT)
+ mipi_dsi_cmds_tx(mfd, &toshiba_tx_buf,
+ toshiba_wsvga_display_on_cmds,
+ ARRAY_SIZE(toshiba_wsvga_display_on_cmds));
+ else
+ return -EINVAL;
return 0;
}
diff --git a/drivers/video/msm/mipi_toshiba_video_wsvga_pt.c b/drivers/video/msm/mipi_toshiba_video_wsvga_pt.c
index 3602e75..ed34aa7 100644
--- a/drivers/video/msm/mipi_toshiba_video_wsvga_pt.c
+++ b/drivers/video/msm/mipi_toshiba_video_wsvga_pt.c
@@ -38,10 +38,8 @@
{
int ret;
-#ifdef CONFIG_FB_MSM_MIPI_PANEL_DETECT
if (msm_fb_detect_client("mipi_video_toshiba_wsvga"))
return 0;
-#endif
pinfo.xres = 600;
pinfo.yres = 1024;
@@ -96,7 +94,7 @@
pinfo.mipi.tx_eot_append = TRUE;
ret = mipi_toshiba_device_register(&pinfo, MIPI_DSI_PRIM,
- MIPI_DSI_PANEL_WVGA_PT);
+ MIPI_DSI_PANEL_WSVGA_PT);
if (ret)
printk(KERN_ERR "%s: failed to register device!\n", __func__);
diff --git a/drivers/video/msm/mipi_toshiba_video_wvga_pt.c b/drivers/video/msm/mipi_toshiba_video_wvga_pt.c
index 1913513..d6cabfc 100644
--- a/drivers/video/msm/mipi_toshiba_video_wvga_pt.c
+++ b/drivers/video/msm/mipi_toshiba_video_wvga_pt.c
@@ -52,10 +52,8 @@
{
int ret;
-#ifdef CONFIG_FB_MSM_MIPI_PANEL_DETECT
if (msm_fb_detect_client("mipi_video_toshiba_wvga"))
return 0;
-#endif
pinfo.xres = 480;
pinfo.yres = 864; /* 856 for V1 surf */
diff --git a/drivers/video/msm/msm_fb.c b/drivers/video/msm/msm_fb.c
index 542eea4..bde0573 100644
--- a/drivers/video/msm/msm_fb.c
+++ b/drivers/video/msm/msm_fb.c
@@ -188,25 +188,42 @@
};
#endif
+#define PANEL_NAME_MAX_LEN 30
static struct msm_fb_platform_data *msm_fb_pdata;
-static char panel_name[128];
-module_param_string(panel_name, panel_name, sizeof(panel_name) , 0);
+static char prim_panel_name[PANEL_NAME_MAX_LEN];
+static char ext_panel_name[PANEL_NAME_MAX_LEN];
+module_param_string(prim_display, prim_panel_name, sizeof(prim_panel_name) , 0);
+module_param_string(ext_display, ext_panel_name, sizeof(ext_panel_name) , 0);
int msm_fb_detect_client(const char *name)
{
- int ret = -EPERM;
+ int ret = 0;
+ u32 len;
#ifdef CONFIG_FB_MSM_MDDI_AUTO_DETECT
u32 id;
#endif
-
- MSM_FB_DEBUG("\n name = %s, panel_name = %s", name, panel_name);
- if (strlen(panel_name)) {
- if (!strcmp((char *)panel_name, name))
+ len = strnlen(name, PANEL_NAME_MAX_LEN);
+ if (strnlen(prim_panel_name, PANEL_NAME_MAX_LEN)) {
+ MSM_FB_DEBUG("\n name = %s, prim_display = %s",
+ name, prim_panel_name);
+ if (!strncmp((char *)prim_panel_name, name, len))
return 0;
else
- return -EPERM;
+ ret = -EPERM;
+ }
+ if (strnlen(ext_panel_name, PANEL_NAME_MAX_LEN)) {
+ MSM_FB_DEBUG("\n name = %s, ext_display = %s",
+ name, ext_panel_name);
+ if (!strncmp((char *)ext_panel_name, name, len))
+ return 0;
+ else
+ ret = -EPERM;
}
+ if (ret)
+ return ret;
+
+ ret = -EPERM;
if (msm_fb_pdata && msm_fb_pdata->detect_client) {
ret = msm_fb_pdata->detect_client(name);
diff --git a/drivers/video/msm/tvout_msm.c b/drivers/video/msm/tvout_msm.c
index 6912961..9ee55cc 100644
--- a/drivers/video/msm/tvout_msm.c
+++ b/drivers/video/msm/tvout_msm.c
@@ -601,6 +601,10 @@
static int __init tvout_init(void)
{
int ret;
+
+ if (msm_fb_detect_client("tvout_msm"))
+ return 0;
+
tvout_msm_state = kzalloc(sizeof(*tvout_msm_state), GFP_KERNEL);
if (!tvout_msm_state) {
DEV_ERR("tvout_msm_init FAILED: out of memory\n");