diff options
| author | Wengang Wu <wgw@motorola.com> | 2014-07-17 16:45:00 -0500 |
|---|---|---|
| committer | Jee Su Chang <w20740@motorola.com> | 2014-07-17 22:07:22 +0000 |
| commit | 0e4a00c83a912944beed3d2d36915278a0d418f7 (patch) | |
| tree | d19773db4d9ee2cc16aee52405f754af4e54d3dc /drivers/video/omap2/omapfb/omapfb-main.c | |
| parent | b0b06d3dbb9d3a100b58b21f7de31ca3cb5240d7 (diff) | |
| download | olio-linux-3.10-0e4a00c83a912944beed3d2d36915278a0d418f7.tar.xz olio-linux-3.10-0e4a00c83a912944beed3d2d36915278a0d418f7.zip | |
IKXCLOCK-3032 Display: turn off display automatically after early init
Change-Id: I9aa283e6014611039fd04f44118cd9bb1f29963f
Diffstat (limited to 'drivers/video/omap2/omapfb/omapfb-main.c')
| -rw-r--r-- | drivers/video/omap2/omapfb/omapfb-main.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/video/omap2/omapfb/omapfb-main.c b/drivers/video/omap2/omapfb/omapfb-main.c index 350ceaa81ff..7464de4c93f 100644 --- a/drivers/video/omap2/omapfb/omapfb-main.c +++ b/drivers/video/omap2/omapfb/omapfb-main.c @@ -1251,8 +1251,10 @@ static int omapfb_blank(int blank, struct fb_info *fbi) switch (blank) { case FB_BLANK_UNBLANK: +#if !defined(CONFIG_WAKEUP_SOURCE_NOTIFY) && !defined(CONFIG_HAS_AMBIENTMODE) if (display->state == OMAP_DSS_DISPLAY_ACTIVE) goto exit; +#endif r = display->driver->enable(display); @@ -1269,8 +1271,10 @@ static int omapfb_blank(int blank, struct fb_info *fbi) case FB_BLANK_VSYNC_SUSPEND: case FB_BLANK_HSYNC_SUSPEND: case FB_BLANK_POWERDOWN: +#if !defined(CONFIG_WAKEUP_SOURCE_NOTIFY) && !defined(CONFIG_HAS_AMBIENTMODE) if (display->state != OMAP_DSS_DISPLAY_ACTIVE) goto exit; +#endif if (d->auto_update_work_enabled) omapfb_stop_auto_update(fbdev, display); @@ -1283,7 +1287,9 @@ static int omapfb_blank(int blank, struct fb_info *fbi) r = -EINVAL; } +#if !defined(CONFIG_WAKEUP_SOURCE_NOTIFY) && !defined(CONFIG_HAS_AMBIENTMODE) exit: +#endif omapfb_unlock(fbdev); return r; |