diff options
| -rw-r--r-- | drivers/video/tegra/host/nvhost_acm.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/video/tegra/host/nvhost_acm.c b/drivers/video/tegra/host/nvhost_acm.c index c2152287506f..bde5a7f9ffc8 100644 --- a/drivers/video/tegra/host/nvhost_acm.c +++ b/drivers/video/tegra/host/nvhost_acm.c @@ -30,7 +30,7 @@ #include "dev.h" -#define ACM_TIMEOUT 1*HZ +#define ACM_TIMEOUT_MSEC 40 #define DISABLE_3D_POWERGATING #define DISABLE_MPE_POWERGATING @@ -88,7 +88,8 @@ void nvhost_module_idle_mult(struct nvhost_module *mod, int refs) mutex_lock(&mod->lock); if (atomic_sub_return(refs, &mod->refcount) == 0) { BUG_ON(!mod->powered); - schedule_delayed_work(&mod->powerdown, ACM_TIMEOUT); + schedule_delayed_work(&mod->powerdown, + msecs_to_jiffies(ACM_TIMEOUT_MSEC)); kick = true; } mutex_unlock(&mod->lock); @@ -226,7 +227,7 @@ void nvhost_module_suspend(struct nvhost_module *mod, bool system_suspend) debug_not_idle(mod); ret = wait_event_timeout(mod->idle, is_module_idle(mod), - ACM_TIMEOUT + msecs_to_jiffies(500)); + msecs_to_jiffies(ACM_TIMEOUT_MSEC+500)); if (ret == 0) nvhost_debug_dump(); |