msm: Display: Add support for "Continuous Splash Screen" feature.
The image displayed on the screen by the android bootloader
driver should continue till the android animation shows up.
Delay the display initialization for MDP, display dependent clocks
and panel power on functions.
Change-Id: Iaec53879def6f4a9d2f6b7b8090f572e64e55d87
Signed-off-by: Kuogee Hsieh <khsieh@codeaurora.org>
Signed-off-by: Chandan Uddaraju <chandanu@codeaurora.org>
diff --git a/drivers/video/msm/mdp.c b/drivers/video/msm/mdp.c
index eb6448b..991a0c8 100644
--- a/drivers/video/msm/mdp.c
+++ b/drivers/video/msm/mdp.c
@@ -1041,6 +1041,16 @@
}
#endif
}
+
+void set_cont_splashScreen_status(int status)
+{
+ if (!status)
+ mdp_pipe_ctrl(MDP_CMD_BLOCK, MDP_BLOCK_POWER_ON, FALSE);
+ else
+ mdp_pipe_ctrl(MDP_CMD_BLOCK, MDP_BLOCK_POWER_OFF, FALSE);
+
+}
+
static int mdp_clk_rate;
static struct platform_device *pdev_list[MSM_FB_MAX_DEV_LIST];
static int pdev_list_cnt;
@@ -1694,7 +1704,7 @@
return clk_rate;
}
-static int mdp_irq_clk_setup(void)
+static int mdp_irq_clk_setup(char cont_splashScreen)
{
int ret;
@@ -1747,12 +1757,18 @@
* mdp_clk should greater than mdp_pclk always
*/
if (mdp_pdata && mdp_pdata->mdp_core_clk_rate) {
+ if (cont_splashScreen)
+ mdp_clk_rate = clk_get_rate(mdp_clk);
+ else
+ mdp_clk_rate = mdp_pdata->mdp_core_clk_rate;
+
mutex_lock(&mdp_clk_lock);
- clk_set_rate(mdp_clk, mdp_pdata->mdp_core_clk_rate);
+ clk_set_rate(mdp_clk, mdp_clk_rate);
if (mdp_lut_clk != NULL)
- clk_set_rate(mdp_lut_clk, mdp_pdata->mdp_core_clk_rate);
+ clk_set_rate(mdp_lut_clk, mdp_clk_rate);
mutex_unlock(&mdp_clk_lock);
}
+
MSM_FB_DEBUG("mdp_clk: mdp_clk=%d\n", (int)clk_get_rate(mdp_clk));
#endif
return 0;
@@ -1793,7 +1809,8 @@
}
mdp_rev = mdp_pdata->mdp_rev;
- rc = mdp_irq_clk_setup();
+
+ rc = mdp_irq_clk_setup(mdp_pdata->cont_splash_enabled);
if (rc)
return rc;
@@ -1802,7 +1819,8 @@
/* initializing mdp hw */
#ifdef CONFIG_FB_MSM_MDP40
- mdp4_hw_init();
+ if (!(mdp_pdata->cont_splash_enabled))
+ mdp4_hw_init();
#else
mdp_hw_init();
#endif
@@ -1836,6 +1854,15 @@
mfd->pdev = msm_fb_dev;
mfd->mdp_rev = mdp_rev;
+ if (mdp_pdata) {
+ if (mdp_pdata->cont_splash_enabled)
+ mfd->cont_splash_done = 0;
+ else
+ mfd->cont_splash_done = 1;
+ }
+
+ set_cont_splashScreen_status(mfd->cont_splash_done);
+
mfd->ov0_wb_buf = MDP_ALLOC(sizeof(struct mdp_buf_type));
mfd->ov1_wb_buf = MDP_ALLOC(sizeof(struct mdp_buf_type));
memset((void *)mfd->ov0_wb_buf, 0, sizeof(struct mdp_buf_type));
@@ -1850,7 +1877,6 @@
mfd->ov1_wb_buf->size = 0;
mfd->mem_hid = 0;
}
-
mfd->ov0_blt_state = 0;
mfd->use_ov0_blt = 0 ;
@@ -2129,6 +2155,11 @@
return -ENOMEM;
}
}
+
+ /* req bus bandwidth immediately */
+ if (!(mfd->cont_splash_done))
+ mdp_bus_scale_update_request(5);
+
#endif
/* set driver data */
diff --git a/drivers/video/msm/mdp.h b/drivers/video/msm/mdp.h
index 4598fab..a5165ab 100644
--- a/drivers/video/msm/mdp.h
+++ b/drivers/video/msm/mdp.h
@@ -717,6 +717,8 @@
void mdp3_dsi_cmd_dma_busy_wait(struct msm_fb_data_type *mfd);
#endif
+void set_cont_splashScreen_status(int);
+
int mdp_hw_cursor_update(struct fb_info *info, struct fb_cursor *cursor);
#if defined(CONFIG_FB_MSM_OVERLAY) && defined(CONFIG_FB_MSM_MDP40)
int mdp_hw_cursor_sync_update(struct fb_info *info, struct fb_cursor *cursor);
diff --git a/drivers/video/msm/mdp4_overlay.c b/drivers/video/msm/mdp4_overlay.c
index cc03e97..d945699 100644
--- a/drivers/video/msm/mdp4_overlay.c
+++ b/drivers/video/msm/mdp4_overlay.c
@@ -2249,8 +2249,9 @@
return -ENODEV;
}
- if (!mfd->panel_power_on) /* suspended */
- return -EPERM;
+ if (info->node != 0 || mfd->cont_splash_done) /* primary */
+ if (!mfd->panel_power_on) /* suspended */
+ return -EPERM;
if (req->src.format == MDP_FB_FORMAT)
req->src.format = mfd->fb_imgType;
diff --git a/drivers/video/msm/mdp4_overlay_dsi_video.c b/drivers/video/msm/mdp4_overlay_dsi_video.c
index 53b541e..8867a5d 100644
--- a/drivers/video/msm/mdp4_overlay_dsi_video.c
+++ b/drivers/video/msm/mdp4_overlay_dsi_video.c
@@ -62,6 +62,9 @@
display_on = fxn;
}
+static void mdp4_overlay_dsi_video_wait4event(struct msm_fb_data_type *mfd,
+ int intr_done);
+
int mdp4_dsi_video_on(struct platform_device *pdev)
{
int dsi_width;
@@ -149,6 +152,16 @@
/* MDP cmd block enable */
mdp_pipe_ctrl(MDP_CMD_BLOCK, MDP_BLOCK_POWER_ON, FALSE);
+
+ if (!(mfd->cont_splash_done)) {
+ mfd->cont_splash_done = 1;
+ set_cont_splashScreen_status(mfd->cont_splash_done);
+ mdp4_overlay_dsi_video_wait4event(mfd, INTR_DMA_P_DONE);
+ /* disable timing generator */
+ MDP_OUTP(MDP_BASE + DSI_VIDEO_BASE, 0);
+ mipi_dsi_controller_cfg(0);
+ }
+
if (is_mdp4_hw_reset()) {
mdp4_hw_init();
outpdw(MDP_BASE + 0x0038, mdp4_display_intf);
diff --git a/drivers/video/msm/mipi_dsi.c b/drivers/video/msm/mipi_dsi.c
index dfdc3f7..012320e 100644
--- a/drivers/video/msm/mipi_dsi.c
+++ b/drivers/video/msm/mipi_dsi.c
@@ -430,7 +430,7 @@
return 0;
}
- mipi_dsi_clk_init(&pdev->dev);
+ mipi_dsi_clk_init(pdev);
if (!mipi_dsi_resource_initialized)
return -EPERM;
diff --git a/drivers/video/msm/mipi_dsi.h b/drivers/video/msm/mipi_dsi.h
index 8a86fd2..b6a3e1c 100644
--- a/drivers/video/msm/mipi_dsi.h
+++ b/drivers/video/msm/mipi_dsi.h
@@ -299,7 +299,7 @@
int target_type);
int mipi_dsi_clk_div_config(uint8 bpp, uint8 lanes,
uint32 *expected_dsi_pclk);
-void mipi_dsi_clk_init(struct device *dev);
+void mipi_dsi_clk_init(struct platform_device *pdev);
void mipi_dsi_clk_deinit(struct device *dev);
void mipi_dsi_ahb_ctrl(u32 enable);
void mipi_dsi_turn_on_clks(void);
diff --git a/drivers/video/msm/mipi_toshiba.c b/drivers/video/msm/mipi_toshiba.c
index 2db8bcf..aeaa5aa 100644
--- a/drivers/video/msm/mipi_toshiba.c
+++ b/drivers/video/msm/mipi_toshiba.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2008-2011, Code Aurora Forum. All rights reserved.
+/* Copyright (c) 2008-2012, Code Aurora Forum. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and
@@ -224,11 +224,21 @@
return 0;
}
+void mipi_bklight_pwm_cfg(void)
+{
+ if (mipi_toshiba_pdata && mipi_toshiba_pdata->dsi_pwm_cfg)
+ mipi_toshiba_pdata->dsi_pwm_cfg();
+}
+
static void mipi_toshiba_set_backlight(struct msm_fb_data_type *mfd)
{
int ret;
+ static int bklight_pwm_cfg;
- pr_debug("%s: back light level %d\n", __func__, mfd->bl_level);
+ if (bklight_pwm_cfg == 0) {
+ mipi_bklight_pwm_cfg();
+ bklight_pwm_cfg++;
+ }
if (bl_lpm) {
ret = pwm_config(bl_lpm, MIPI_TOSHIBA_PWM_DUTY_LEVEL *
diff --git a/drivers/video/msm/msm_dss_io_7x27a.c b/drivers/video/msm/msm_dss_io_7x27a.c
index 032c9cd..a683cd1 100644
--- a/drivers/video/msm/msm_dss_io_7x27a.c
+++ b/drivers/video/msm/msm_dss_io_7x27a.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2008-2011, Code Aurora Forum. All rights reserved.
+/* Copyright (c) 2008-2012, Code Aurora Forum. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and
@@ -31,7 +31,7 @@
static struct clk *ahb_s_clk;
static struct clk *ebi1_dsi_clk;
-void mipi_dsi_clk_init(struct device *dev)
+void mipi_dsi_clk_init(struct platform_device *pdev)
{
dsi_esc_clk = clk_get(NULL, "dsi_esc_clk");
if (IS_ERR(dsi_esc_clk)) {
diff --git a/drivers/video/msm/msm_dss_io_8960.c b/drivers/video/msm/msm_dss_io_8960.c
index cb18ede..17644da 100644
--- a/drivers/video/msm/msm_dss_io_8960.c
+++ b/drivers/video/msm/msm_dss_io_8960.c
@@ -63,8 +63,13 @@
static struct clk *amp_pclk;
-void mipi_dsi_clk_init(struct device *dev)
+void mipi_dsi_clk_init(struct platform_device *pdev)
{
+ struct msm_fb_data_type *mfd;
+ struct device *dev = &pdev->dev;
+
+ mfd = platform_get_drvdata(pdev);
+
amp_pclk = clk_get(NULL, "amp_pclk");
if (IS_ERR(amp_pclk)) {
pr_err("can't find amp_pclk\n");
@@ -95,6 +100,14 @@
goto mipi_dsi_clk_err;
}
+ if (!(mfd->cont_splash_done)) {
+ clk_enable(amp_pclk); /* clock for AHB-master to AXI */
+ clk_enable(dsi_m_pclk);
+ clk_enable(dsi_s_pclk);
+ clk_enable(dsi_byte_div_clk);
+ clk_enable(dsi_esc_clk);
+ }
+
return;
mipi_dsi_clk_err:
diff --git a/drivers/video/msm/msm_dss_io_8x60.c b/drivers/video/msm/msm_dss_io_8x60.c
index 6dac6c1..253414b 100644
--- a/drivers/video/msm/msm_dss_io_8x60.c
+++ b/drivers/video/msm/msm_dss_io_8x60.c
@@ -33,7 +33,7 @@
static struct clk *amp_pclk;
-void mipi_dsi_clk_init(struct device *dev)
+void mipi_dsi_clk_init(struct platform_device *pdev)
{
amp_pclk = clk_get(NULL, "amp_pclk");
if (IS_ERR(amp_pclk)) {
diff --git a/drivers/video/msm/msm_fb.c b/drivers/video/msm/msm_fb.c
index 7adbdae..bc0a65c 100644
--- a/drivers/video/msm/msm_fb.c
+++ b/drivers/video/msm/msm_fb.c
@@ -1463,6 +1463,10 @@
printk(KERN_ERR "pm_runtime: fail to wake up\n");
}
+ if (info->node == 0 && !(mfd->cont_splash_done)) { /* primary */
+ mfd->ref_cnt++;
+ return 0;
+ }
if (!mfd->ref_cnt) {
mdp_set_dma_pan_info(info, NULL, TRUE);
@@ -1513,8 +1517,9 @@
struct msm_fb_data_type *mfd = (struct msm_fb_data_type *)info->par;
struct msm_fb_panel_data *pdata;
- if ((!mfd->op_enable) || (!mfd->panel_power_on))
- return -EPERM;
+ if (info->node != 0 || mfd->cont_splash_done) /* primary */
+ if ((!mfd->op_enable) || (!mfd->panel_power_on))
+ return -EPERM;
if (var->xoffset > (info->var.xres_virtual - info->var.xres))
return -EINVAL;
@@ -1573,6 +1578,15 @@
mutex_unlock(&msm_fb_notify_update_sem);
down(&msm_fb_pan_sem);
+
+ if (info->node == 0 && !(mfd->cont_splash_done)) { /* primary */
+ mdp_set_dma_pan_info(info, NULL, TRUE);
+ if (msm_fb_blank_sub(FB_BLANK_UNBLANK, info, mfd->op_enable)) {
+ pr_err("%s: can't turn on display!\n", __func__);
+ return -EINVAL;
+ }
+ }
+
mdp_set_dma_pan_info(info, dirtyPtr,
(var->activate == FB_ACTIVATE_VBL));
mdp_dma_pan_update(info);
@@ -2680,6 +2694,14 @@
add_timer(&mfd->msmfb_no_update_notify_timer);
mutex_unlock(&msm_fb_notify_update_sem);
+ if (info->node == 0 && !(mfd->cont_splash_done)) { /* primary */
+ mdp_set_dma_pan_info(info, NULL, TRUE);
+ if (msm_fb_blank_sub(FB_BLANK_UNBLANK, info, mfd->op_enable)) {
+ pr_err("%s: can't turn on display!\n", __func__);
+ return -EINVAL;
+ }
+ }
+
ret = mdp4_overlay_play(info, &req);
if (unset_bl_level && !bl_updated) {
diff --git a/drivers/video/msm/msm_fb.h b/drivers/video/msm/msm_fb.h
index 90fa9b3..79d9140 100644
--- a/drivers/video/msm/msm_fb.h
+++ b/drivers/video/msm/msm_fb.h
@@ -179,6 +179,7 @@
u32 use_ov0_blt, ov0_blt_state;
u32 use_ov1_blt, ov1_blt_state;
u32 writeback_state;
+ int cont_splash_done;
};
struct dentry *msm_fb_get_debugfs_root(void);