summaryrefslogtreecommitdiff
path: root/drivers/video
diff options
context:
space:
mode:
authorTerje Bergstrom <tbergstrom@nvidia.com>2011-08-15 08:52:22 +0300
committerVarun Colbert <vcolbert@nvidia.com>2011-08-16 17:16:37 -0700
commit99ab9580f8eea1018495f4c5b239ca9b6c1cc8c1 (patch)
tree629883b5bbb65e6006f434351cdf8ca47ec43643 /drivers/video
parent304380a459cf3370d86f2476d5897b86374f5c85 (diff)
tegra: nvhost: On Tegra2, set 2D clock to maximum
On Tegra2, clocks are not rounded up. Nvhost tries to set 2D clock to zero, which causes a division-by-zero error. Check for SoC version and for Tegra2, set clocks always to maximum. Bug 863937 Change-Id: I3043cb2ddd243a48700de47e1bfdd13920fd0e8c Reviewed-on: http://git-master/r/47114 Reviewed-by: Varun Colbert <vcolbert@nvidia.com> Tested-by: Varun Colbert <vcolbert@nvidia.com>
Diffstat (limited to 'drivers/video')
-rw-r--r--drivers/video/tegra/host/nvhost_acm.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/video/tegra/host/nvhost_acm.c b/drivers/video/tegra/host/nvhost_acm.c
index b042aa1b35ee..164617c7229d 100644
--- a/drivers/video/tegra/host/nvhost_acm.c
+++ b/drivers/video/tegra/host/nvhost_acm.c
@@ -474,7 +474,8 @@ int nvhost_module_init(struct nvhost_module *mod, const char *name,
mod->clk[i] = clk_get(dev, get_module_clk_id(name, i));
if (IS_ERR_OR_NULL(mod->clk[i]))
break;
- if (strcmp(name, "gr2d") == 0)
+ if (strcmp(name, "gr2d") == 0
+ && tegra_get_chipid() != TEGRA_CHIPID_TEGRA2)
rate = clk_round_rate(mod->clk[i], 0);
else
rate = clk_round_rate(mod->clk[i], UINT_MAX);