Revert "lcd: optimize the time of carrying the bowl to light up screen"android-wear-7.1.1_r0.41

This reverts commit db2eb9af1c2a4a7e00ec45e6fe01383d7dd77c16.

4 files changed, 9 insertions, 60 deletions

diff --git a/drivers/spi/spidev.c b/drivers/spi/spidev.c
index b4c0eb9fac89..39b94eea0484 100755
--- a/drivers/spi/spidev.c
+++ b/drivers/spi/spidev.c
@@ -72,7 +72,7 @@
 #define WAKEUP_DISPLAY_INTERVAL (1*HZ)
 
 static DECLARE_BITMAP(minors, N_SPI_MINORS);
-extern void mdss_fb_spidev_display(void);
+
 
 /* Bit masks for spi_device.mode management.  Note that incorrect
  * settings for some settings can cause *lots* of trouble for other
@@ -771,8 +771,6 @@ static void spidev_wakeup_display_work(struct work_struct *work)
 			mutex_unlock(&spidev->buf_list_lock);
 			spidev_complete(&spidev->read_compl);
 			wake_lock_timeout(&spidev->wake_lock, DATA_TRANSFER_INTERVAL);
-			pr_info("mdss_fb_spidev_display enter\n");
-			mdss_fb_spidev_display();
 		}
 		else
 		{
diff --git a/drivers/video/fbdev/core/fbmem.c b/drivers/video/fbdev/core/fbmem.c
index 92ec376e6b81..c082ae8e50ce 100755
--- a/drivers/video/fbdev/core/fbmem.c
+++ b/drivers/video/fbdev/core/fbmem.c
@@ -39,9 +39,7 @@
     /*
      *  Frame buffer device initialization and setup routines
      */
-static struct fb_event s_fb_event;
-static int s_fb_blank = 0;
-static struct work_struct fb_blank_work;
+
 #define FBPIXMAPSIZE	(1024 * 8)
 
 static DEFINE_MUTEX(registration_lock);
@@ -1053,22 +1051,18 @@ fb_set_var(struct fb_info *info, struct fb_var_screeninfo *var)
 	return ret;
 }
 EXPORT_SYMBOL(fb_set_var);
-static void fb_notifier_blank_work(struct work_struct *work)
-{
-	fb_notifier_call_chain(FB_EVENT_BLANK, &s_fb_event);
-}
 
 int
 fb_blank(struct fb_info *info, int blank)
 {	
+	struct fb_event event;
 	int ret = -EINVAL, early_ret;
 
  	if (blank > FB_BLANK_POWERDOWN)
  		blank = FB_BLANK_POWERDOWN;
 
-	s_fb_blank = blank;
-	s_fb_event.info = info;
-	s_fb_event.data = &s_fb_blank;
+	event.info = info;
+	event.data = ␣
 
 	early_ret = fb_notifier_call_chain(FB_EARLY_EVENT_BLANK, &event);
 
@@ -1076,23 +1070,14 @@ fb_blank(struct fb_info *info, int blank)
  		ret = info->fbops->fb_blank(blank, info);
 
 	if (!ret)
-	{
-		if (FB_BLANK_UNBLANK == blank)
-		{
-			schedule_work(&fb_blank_work);
-		}
-		else
-		{
-			fb_notifier_call_chain(FB_EVENT_BLANK, &s_fb_event);
-		}
-	}
+		fb_notifier_call_chain(FB_EVENT_BLANK, &event);
 	else {
 		/*
 		 * if fb_blank is failed then revert effects of
 		 * the early blank event.
 		 */
 		if (!early_ret)
-			fb_notifier_call_chain(FB_R_EARLY_EVENT_BLANK, &s_fb_event);
+			fb_notifier_call_chain(FB_R_EARLY_EVENT_BLANK, &event);
 	}
 
  	return ret;
@@ -1874,7 +1859,6 @@ fbmem_init(void)
 		printk(KERN_WARNING "Unable to create fb class; errno = %ld\n", PTR_ERR(fb_class));
 		fb_class = NULL;
 	}
-	INIT_WORK(&fb_blank_work,fb_notifier_blank_work);
 	return 0;
 }
 
diff --git a/drivers/video/msm/mdss/mdp3_ctrl.c b/drivers/video/msm/mdss/mdp3_ctrl.c
index 8d918e93f1d3..025bbd855331 100755..100644
--- a/drivers/video/msm/mdss/mdp3_ctrl.c
+++ b/drivers/video/msm/mdss/mdp3_ctrl.c
@@ -47,7 +47,6 @@ static int mdp3_ctrl_get_pack_pattern(u32 imgType);
 
 int mdp3_wait_for_dma_done(struct mdp3_session_data *session);
 
-struct msm_fb_data_type *g_mfd = NULL;
 u32 mdp_lut_inverse16[MDP_LUT_SIZE] = {
 0, 65536, 32768, 21845, 16384, 13107, 10923, 9362, 8192, 7282, 6554, 5958,
 5461, 5041, 4681, 4369, 4096, 3855, 3641, 3449, 3277, 3121, 2979, 2849, 2731,
@@ -2754,7 +2753,6 @@ int mdp3_ctrl_init(struct msm_fb_data_type *mfd)
 	int splash_mismatch = 0;
 
 	pr_info("mdp3_ctrl_init\n");
-	g_mfd = mfd;
 	rc = mdp3_parse_dt_splash(mfd);
 	if (rc)
 		splash_mismatch = 1;
diff --git a/drivers/video/msm/mdss/mdss_fb.c b/drivers/video/msm/mdss/mdss_fb.c
index 99cdb894c743..e3a169effdbd 100755..100644
--- a/drivers/video/msm/mdss/mdss_fb.c
+++ b/drivers/video/msm/mdss/mdss_fb.c
@@ -78,7 +78,6 @@
 #endif
 
 #define BUFF_LEN   10
-#define SPIDEV_DISPLAY_WAIT_MS   20
 
 static struct fb_info *fbi_list[MAX_FBI_LIST];
 static int fbi_list_index;
@@ -93,9 +92,6 @@ static u32 mdss_fb_pseudo_palette[16] = {
 };
 
 static struct msm_mdp_interface *mdp_instance;
-static struct mutex g_fb_unblank_lock;
-static struct delayed_work g_fb_unblank_work;
-extern struct msm_fb_data_type *g_mfd;
 
 static int mdss_fb_register(struct msm_fb_data_type *mfd);
 static int mdss_fb_open(struct fb_info *info, int user);
@@ -2111,12 +2107,7 @@ static int mdss_fb_blank_sub(int blank_mode, struct fb_info *info,
 	switch (blank_mode) {
 	case FB_BLANK_UNBLANK:
 		pr_debug("unblank called. cur pwr state=%d\n", cur_power_state);
-		mutex_lock(&g_fb_unblank_lock);
-		if (!mdss_panel_is_power_on_interactive(mfd->panel_power_state))
-		{
-			ret = mdss_fb_blank_unblank(mfd);
-		}
-		mutex_unlock(&g_fb_unblank_lock);
+		ret = mdss_fb_blank_unblank(mfd);
 		break;
 	case BLANK_FLAG_ULP:
 		req_power_state = MDSS_PANEL_POWER_LP2;
@@ -4649,27 +4640,6 @@ exit:
 	return ret;
 }
 
-static void mdss_fb_spidev_display_work(struct work_struct *work)
-{
-	int ret = 0;
-
-	pr_debug("mdss_fb_spidev_display_work enter\n");
-	if (!g_mfd){
-		pr_err("g_mfd is NULL\n");
-		return;
-	}
-
-	ret = mdss_fb_blank(FB_BLANK_UNBLANK, g_mfd->fbi);
-	if (ret) {
-		pr_err("mdss_fb_spidev_blank err\n");
-	}
-}
-
-void  mdss_fb_spidev_display(void)
-{
-	schedule_delayed_work(&g_fb_unblank_work,msecs_to_jiffies(SPIDEV_DISPLAY_WAIT_MS));
-}
-EXPORT_SYMBOL(mdss_fb_spidev_display);
 /*
  * mdss_fb_mode_switch() - Function to change DSI mode
  * @mfd:	Framebuffer data structure for display
@@ -5003,8 +4973,7 @@ int __init mdss_fb_init(void)
 
 	if (platform_driver_register(&mdss_fb_driver))
 		return rc;
-	mutex_init(&g_fb_unblank_lock);
-	INIT_DELAYED_WORK(&g_fb_unblank_work,mdss_fb_spidev_display_work);
+
 	return 0;
 }