diff options
| author | Alex Frid <afrid@nvidia.com> | 2014-02-13 17:41:10 -0800 |
|---|---|---|
| committer | Yu-Huan Hsu <yhsu@nvidia.com> | 2014-02-14 12:25:32 -0800 |
| commit | 0b281596185e8de4c505d1336f4f1fb7a3f45939 (patch) | |
| tree | 99f675d8c892a1d2bc05f014e02c9a61c45c8457 /arch/arm/mach-tegra/tegra_simon.c | |
| parent | 8385a936f4234e9419ef361f881f36273a76141b (diff) | |
ARM: tegra: power: Bypass thermal zone lock in SiMon
Bypass thermal zone lock when calling get temperature interface from
SiMon callback to avoid ABBA dead-lock (thermal zone lock also covers
cooling device update that locks CPU/GPU clock rate interfaces that
are calling SiMon grading callbacks).
Bug 1343366
Change-Id: I319d26dde1a79752f43f217b40279231152646c9
Signed-off-by: Alex Frid <afrid@nvidia.com>
Reviewed-on: http://git-master/r/367477
Reviewed-by: Yu-Huan Hsu <yhsu@nvidia.com>
Diffstat (limited to 'arch/arm/mach-tegra/tegra_simon.c')
| -rw-r--r-- | arch/arm/mach-tegra/tegra_simon.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-tegra/tegra_simon.c b/arch/arm/mach-tegra/tegra_simon.c index 989d77505e6b..d0dcf48cdb62 100644 --- a/arch/arm/mach-tegra/tegra_simon.c +++ b/arch/arm/mach-tegra/tegra_simon.c @@ -79,7 +79,7 @@ static int tegra_simon_gpu_grading_cb( (s64)grading_sec * 1000)) return NOTIFY_OK; - if (thermal_zone_get_temp(grader->tzd, &t)) { + if (grader->tzd->ops->get_temp(grader->tzd, &t)) { pr_err("%s: Failed to get %s temperature\n", __func__, grader->domain_name); return NOTIFY_OK; @@ -177,7 +177,7 @@ static int tegra_simon_cpu_grading_cb( (s64)grading_sec * 1000)) return NOTIFY_OK; - if (thermal_zone_get_temp(grader->tzd, &t)) { + if (grader->tzd->ops->get_temp(grader->tzd, &t)) { pr_err("%s: Failed to get %s temperature\n", __func__, grader->domain_name); return NOTIFY_OK; |