From: Huang, Tao <huangtao@rock-chips.com>
Date: Fri, 13 Feb 2015 06:40:39 +0000 (+0800)
Subject: Merge branch develop-3.10
X-Git-Tag: firefly_0821_release~4158^2~447^2~1
X-Git-Url: http://plrg.eecs.uci.edu/git/?p=firefly-linux-kernel-4.4.55.git;a=commitdiff_plain;h=8e854569bebc2de9d4638cf79dd354d7619ad522

Merge branch develop-3.10

Signed-off-by: Huang, Tao <huangtao@rock-chips.com>

Conflicts:
	drivers/video/rockchip/rk_fb.c
---

8e854569bebc2de9d4638cf79dd354d7619ad522
diff --cc drivers/video/rockchip/rk_fb.c
index f568c47ef165,837e2c34dfa6..25fa86b2a097
mode 100644,100755..100644
--- a/drivers/video/rockchip/rk_fb.c
+++ b/drivers/video/rockchip/rk_fb.c
@@@ -3101,12 -3104,11 +3103,14 @@@ int rk_fb_switch_screen(struct rk_scree
  
  			if (dev_drv->ops->dsp_black)
  				dev_drv->ops->dsp_black(dev_drv, 0);
 +			if ((dev_drv->ops->backlight_close) &&
 +			    (rk_fb->disp_policy != DISPLAY_POLICY_BOX))
 +				dev_drv->ops->backlight_close(dev_drv, 0);
- 		} else if (rk_fb->num_lcdc > 1 && rk_fb->disp_policy == DISPLAY_POLICY_BOX) {
+ 		} else if (rk_fb->num_lcdc > 1) {
  			/* If there is more than one lcdc device, we disable
  			   the layer which attached to this device */
+ 			dev_drv->suspend_flag = 1;
+ 			flush_kthread_worker(&dev_drv->update_regs_worker);
  			for (i = 0; i < dev_drv->lcdc_win_num; i++) {
  				if (dev_drv->win[i] && dev_drv->win[i]->state)
  					dev_drv->ops->open(dev_drv, i, 0);