diff options
| author | Terje Bergstrom <tbergstrom@nvidia.com> | 2012-02-10 09:28:37 +0200 |
|---|---|---|
| committer | Rohan Somvanshi <rsomvanshi@nvidia.com> | 2012-02-13 06:40:39 -0800 |
| commit | faf2c6cfa976484b85d7e2b510573b23835dc06e (patch) | |
| tree | 62cf8bd78626312dc22e354c95e879ddcb54beab /drivers/video/tegra/dc/dsi.c | |
| parent | a1ec5e7bfe59996409a90298e78eef321a25c960 (diff) | |
video: tegra: dc: Ignore suspend if DSI is disabled
DSI enables during suspend time host1x, and then checks if DSI is really
enabled. Now DSI first checks if it's enabled. If yes, it'll turn on host1x
and disable it.
Bug 887332
Change-Id: I206f908a62d0a56f0737c31634fa46613ca07d7e
Reviewed-on: http://git-master/r/82755
Reviewed-by: Mayuresh Kulkarni <mkulkarni@nvidia.com>
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Animesh Kishore <ankishore@nvidia.com>
Reviewed-by: Nitin Kumbhar <nkumbhar@nvidia.com>
Reviewed-by: Kevin Huang (Eng-SW) <kevinh@nvidia.com>
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
Tested-by: Terje Bergstrom <tbergstrom@nvidia.com>
Diffstat (limited to 'drivers/video/tegra/dc/dsi.c')
| -rw-r--r-- | drivers/video/tegra/dc/dsi.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/video/tegra/dc/dsi.c b/drivers/video/tegra/dc/dsi.c index 2c511efc4156..b3dd079d449e 100644 --- a/drivers/video/tegra/dc/dsi.c +++ b/drivers/video/tegra/dc/dsi.c @@ -2599,12 +2599,12 @@ static void tegra_dc_dsi_suspend(struct tegra_dc *dc) dsi = tegra_dc_get_outdata(dc); + if (!dsi->enabled) + return; + tegra_dc_io_start(dc); mutex_lock(&dsi->lock); - if (!dsi->enabled) - goto fail; - if (!dsi->info.power_saving_suspend) { if (dsi->ulpm) { if (tegra_dsi_exit_ulpm(dsi) < 0) { |