diff options
| author | codeworkx <codeworkx@cyanogenmod.com> | 2012-11-18 00:15:08 +0100 |
|---|---|---|
| committer | codeworkx <codeworkx@cyanogenmod.com> | 2012-11-18 00:15:08 +0100 |
| commit | c6a62c86784c3374b82730808dac491f1c092806 (patch) | |
| tree | da07fd6a73a02c1827f861be72fe791150728aa4 | |
| parent | 11fad658d36b91f17e5ec85060784a1f659707b9 (diff) | |
| download | kernel_samsung_espresso10-c6a62c86784c3374b82730808dac491f1c092806.tar.gz kernel_samsung_espresso10-c6a62c86784c3374b82730808dac491f1c092806.tar.bz2 kernel_samsung_espresso10-c6a62c86784c3374b82730808dac491f1c092806.zip | |
earlysuspend: change level on dss to not break electronbeam animation
also remove hack on fbearlysuspend
Change-Id: I7e0a8159a9a9ed02effef0de86f4c5de6789672f
| -rw-r--r-- | drivers/video/omap2/dss/core.c | 2 | ||||
| -rw-r--r-- | kernel/power/fbearlysuspend.c | 5 |
2 files changed, 1 insertions, 6 deletions
diff --git a/drivers/video/omap2/dss/core.c b/drivers/video/omap2/dss/core.c index 782017f3f47..e962f59f8a8 100644 --- a/drivers/video/omap2/dss/core.c +++ b/drivers/video/omap2/dss/core.c @@ -570,7 +570,7 @@ static int omap_dss_bus_register(void) #ifdef CONFIG_HAS_EARLYSUSPEND core.dss_early_suspend_info.suspend = dss_early_suspend; core.dss_early_suspend_info.resume = dss_late_resume; - core.dss_early_suspend_info.level = EARLY_SUSPEND_LEVEL_DISABLE_FB + 2; + core.dss_early_suspend_info.level = EARLY_SUSPEND_LEVEL_DISABLE_FB - 10; register_early_suspend(&core.dss_early_suspend_info); #endif diff --git a/kernel/power/fbearlysuspend.c b/kernel/power/fbearlysuspend.c index d2600594d7f..15137650149 100644 --- a/kernel/power/fbearlysuspend.c +++ b/kernel/power/fbearlysuspend.c @@ -13,7 +13,6 @@ * */ -#include <linux/delay.h> #include <linux/earlysuspend.h> #include <linux/module.h> #include <linux/wait.h> @@ -34,10 +33,6 @@ static void stop_drawing_early_suspend(struct early_suspend *h) int ret; unsigned long irq_flags; - /* FIXME: earlysuspend breaks androids CRT-off animation - * Sleep a little bit to get it played properly */ - msleep(500); - spin_lock_irqsave(&fb_state_lock, irq_flags); fb_state = FB_STATE_REQUEST_STOP_DRAWING; spin_unlock_irqrestore(&fb_state_lock, irq_flags); |