diff options
| author | Wengang Wu <wgw@motorola.com> | 2014-12-04 11:41:01 -0600 |
|---|---|---|
| committer | Wengang Wu <wgw@motorola.com> | 2014-12-04 11:41:01 -0600 |
| commit | 89fdc2c4bb83fff36199cd883a27efb317f02037 (patch) | |
| tree | 376b2da6a289727b9880f8534c907186862ab45a | |
| parent | 2133b1533235e823ecf23cdfac522b64e5548dd5 (diff) | |
| download | olio-linux-3.10-89fdc2c4bb83fff36199cd883a27efb317f02037.tar.xz olio-linux-3.10-89fdc2c4bb83fff36199cd883a27efb317f02037.zip | |
IKXCLOCK-4509 Display: tilting is not activating the screen
put same priority for enable and interactive control of display
Change-Id: Iddc721a831c19f1e97eec1c4bf68a355064cb69d
| -rw-r--r-- | drivers/video/omap2/displays/panel-minnow.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/drivers/video/omap2/displays/panel-minnow.c b/drivers/video/omap2/displays/panel-minnow.c index 59c3113dea4..d1014b0af1d 100644 --- a/drivers/video/omap2/displays/panel-minnow.c +++ b/drivers/video/omap2/displays/panel-minnow.c @@ -2541,6 +2541,7 @@ static int minnow_panel_probe(struct omap_dss_device *dssdev) mpd->dssdev = dssdev; mpd->first_enable = true; mpd->m4_state = DISPLAY_ENABLE; + mpd->interactive = true; r = minnow_panel_dt_init(mpd); if (r) @@ -3470,7 +3471,7 @@ static void minnow_panel_te_timeout_work_callback(struct work_struct *work) static int minnow_panel_enable(struct omap_dss_device *dssdev) { struct minnow_panel_data *mpd = dev_get_drvdata(&dssdev->dev); - int r; + int r, state; mutex_lock(&mpd->lock); #ifdef CONFIG_WAKEUP_SOURCE_NOTIFY @@ -3480,7 +3481,12 @@ static int minnow_panel_enable(struct omap_dss_device *dssdev) cancel_delayed_work(&mpd->early_init_timeout_work); } #endif - r = minnow_panel_change_state_mlocked(mpd, DISPLAY_ENABLE); + state = DISPLAY_ENABLE; +#ifdef CONFIG_HAS_AMBIENTMODE + if (!mpd->interactive) + state = DISPLAY_AMBIENT_ON; +#endif + r = minnow_panel_change_state_mlocked(mpd, state); mutex_unlock(&mpd->lock); return r; } |