summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGreg Roth <groth@nvidia.com>2011-08-21 21:55:10 -0700
committerVarun Colbert <vcolbert@nvidia.com>2011-08-22 17:58:31 -0700
commit0ef115904285e4b3a0da700767ab5ff18ba17138 (patch)
tree04751266de4694f39c0da8b4cd7a82bb70496f46
parente5335742a601330c94dda6d89b63fcc269ec88c5 (diff)
video: tegra: nvhost: Context save on suspend
Save context when clock gating. System suspend might happen when unit is clock gated, which requires context to be restored at resume. Bug 857053 Bug 866693 Change-Id: Ic45f17e18447d530f6a680ff14ac5cad13639fdd Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com> Reviewed-on: http://git-master/r/48401 Reviewed-by: Varun Colbert <vcolbert@nvidia.com> Tested-by: Varun Colbert <vcolbert@nvidia.com>
-rw-r--r--drivers/video/tegra/host/nvhost_acm.c2
-rw-r--r--drivers/video/tegra/host/t20/channel_t20.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/video/tegra/host/nvhost_acm.c b/drivers/video/tegra/host/nvhost_acm.c
index caa49efbd61c..d4dadb491812 100644
--- a/drivers/video/tegra/host/nvhost_acm.c
+++ b/drivers/video/tegra/host/nvhost_acm.c
@@ -95,7 +95,7 @@ void nvhost_module_busy(struct nvhost_module *mod)
}
while (i < mod->num_clks)
clk_enable(mod->clk[i++]);
- if (mod->can_powergate && mod->func)
+ if (mod->func)
mod->func(mod, NVHOST_POWER_ACTION_ON);
mod->powered = true;
}
diff --git a/drivers/video/tegra/host/t20/channel_t20.c b/drivers/video/tegra/host/t20/channel_t20.c
index b45c00421ec9..ab01ee1c3745 100644
--- a/drivers/video/tegra/host/t20/channel_t20.c
+++ b/drivers/video/tegra/host/t20/channel_t20.c
@@ -331,7 +331,7 @@ static void power_3d(struct nvhost_module *mod, enum nvhost_power_action action)
int err;
void *ref;
- if ((action != NVHOST_POWER_ACTION_OFF) || !mod->can_powergate)
+ if (action != NVHOST_POWER_ACTION_OFF)
return;
mutex_lock(&ch->submitlock);