summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSpencer Sutterlin <ssutterlin@nvidia.com>2013-09-12 20:46:17 -0700
committerHarshada Kale <hkale@nvidia.com>2013-09-20 04:05:08 -0700
commit047024eda0ce5f88ccb402ec02b6d85cae3e208b (patch)
tree18a1bf15aeb1b315722611b54473824744729ce7
parent82706ad44b43575af4e5cd411f1dec54c90a6bb9 (diff)
video: tegra: dc: check ext enabled before flip
Bug 1346021 Change-Id: Id7d8050d33b861da555969dd77674e49b40e159a Signed-off-by: Spencer Sutterlin <ssutterlin@nvidia.com> Reviewed-on: http://git-master/r/274563 (cherry picked from commit 3d9bda712bd8c449c54506f55f45103758b0d00e) Reviewed-on: http://git-master/r/274073 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Mrutyunjay Sawant <msawant@nvidia.com> Tested-by: Mrutyunjay Sawant <msawant@nvidia.com>
-rw-r--r--drivers/video/tegra/dc/ext/dev.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/video/tegra/dc/ext/dev.c b/drivers/video/tegra/dc/ext/dev.c
index 203f1a478190..49c9f26eef48 100644
--- a/drivers/video/tegra/dc/ext/dev.c
+++ b/drivers/video/tegra/dc/ext/dev.c
@@ -1,7 +1,7 @@
/*
* drivers/video/tegra/dc/dev.c
*
- * Copyright (c) 2011-2012, NVIDIA CORPORATION, All rights reserved.
+ * Copyright (c) 2011-2013, NVIDIA CORPORATION, All rights reserved.
*
* Author: Robert Morell <rmorell@nvidia.com>
* Some code based on fbdev extensions written by:
@@ -408,7 +408,7 @@ static void tegra_dc_ext_flip_worker(struct work_struct *work)
wins[nr_win++] = win;
}
- if (!skip_flip) {
+ if (ext->enabled && !skip_flip) {
tegra_dc_update_windows(wins, nr_win);
/* TODO: implement swapinterval here */
tegra_dc_sync_windows(wins, nr_win);