diff options
| author | Per Persson <per.xb.persson@stericsson.com> | 2011-04-28 12:19:09 +0200 |
|---|---|---|
| committer | Robert Marklund <robert.marklund@stericsson.com> | 2011-10-05 12:18:54 +0200 |
| commit | 128fe1a1018fd4c235b9a7a2d59e57a40bcc6958 (patch) | |
| tree | 4882cb806b975f213aac74a144b72bf1c3aaf8c1 /drivers/video/mcde/mcde_fb.c | |
| parent | dfb25bc49175988f3846fdb03fc5a512b135309d (diff) | |
video: mcde: Allow HDMI to stay alive
Add possibility to avoid Early suspend when HDMI cable is
connected.
ST-Ericsson ID: 336500
ST-Ericsson Linux next: Not tested, ER 282779
ST-Ericsson FOSS-OUT ID: Trivial
Change-Id: I5ce2b3f16ad405066f5345c0651374ce634aa171
Signed-off-by: Per Persson <per.xb.persson@stericsson.com>
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/21257
Reviewed-by: QATOOLS
Reviewed-by: QATEST
Reviewed-by: Marcel TUNNISSEN <marcel.tuennissen@stericsson.com>
Reviewed-by: Jimmy RUBIN <jimmy.rubin@stericsson.com>
Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com>
Diffstat (limited to 'drivers/video/mcde/mcde_fb.c')
| -rw-r--r-- | drivers/video/mcde/mcde_fb.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/video/mcde/mcde_fb.c b/drivers/video/mcde/mcde_fb.c index 6d341dde8b5..628b10953f6 100644 --- a/drivers/video/mcde/mcde_fb.c +++ b/drivers/video/mcde/mcde_fb.c @@ -102,7 +102,8 @@ static void early_suspend(struct early_suspend *data) console_lock(); for (i = 0; i < mfb->num_ovlys; i++) { - if (mfb->ovlys[i]) + if (mfb->ovlys[i] && mfb->ovlys[i]->ddev && + (mfb->ovlys[i]->ddev->stay_alive == false)) mcde_dss_disable_display(mfb->ovlys[i]->ddev); } console_unlock(); @@ -772,6 +773,9 @@ void mcde_fb_destroy(struct mcde_display_device *dev) fb_dealloc_cmap(&dev->fbi->cmap); +#ifdef CONFIG_HAS_EARLYSUSPEND + unregister_early_suspend(&mfb->early_suspend); +#endif unregister_framebuffer(dev->fbi); free_fb_mem(dev->fbi); framebuffer_release(dev->fbi); |