diff options
| author | Per Persson <per.xb.persson@stericsson.com> | 2011-04-28 12:19:09 +0200 |
|---|---|---|
| committer | Jonas ABERG <jonas.aberg@stericsson.com> | 2011-05-03 13:13:49 +0200 |
| commit | 93e928db8ee75579625002a204d77da912d3afeb (patch) | |
| tree | 12b85f744e0cc16ce9678127a96de94bf981b2f8 /drivers | |
| parent | ca4ad67501e296c2dd980daab49989d077984018 (diff) | |
[ANDROID] 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')
| -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 49924e4fe5d..b9257db4bdf 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) acquire_console_sem(); 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); } release_console_sem(); @@ -745,6 +746,9 @@ void mcde_fb_destroy(struct mcde_display_device *dev) mcde_dss_destroy_overlay(mfb->ovlys[i]); } +#ifdef CONFIG_HAS_EARLYSUSPEND + unregister_early_suspend(&mfb->early_suspend); +#endif unregister_framebuffer(dev->fbi); free_fb_mem(dev->fbi); framebuffer_release(dev->fbi); |