summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu/gk20a/gk20a.c
diff options
context:
space:
mode:
authorPrashant Malani <pmalani@nvidia.com>2014-04-09 14:47:27 -0400
committerDan Willemsen <dwillemsen@nvidia.com>2015-03-18 15:09:02 -0400
commitbc563de0bf6be6e6d23e0bc2e4831cd7e4014556 (patch)
tree67b53e338e11c9a18ad6b9bd32f4ba3cc8d29c5d /drivers/gpu/nvgpu/gk20a/gk20a.c
parentb210a775cf41552f8bcd03ef35f1c23d53b5a0e1 (diff)
gpu: nvgpu: gk20a: disable devfreq before gk20a
Ensure devfreq is disabled before shutting down gk20a, to prevent possible races with reading of gpu load, and the shutdown of gpu itself. Bug 1492913 Change-Id: I016fdba9515120fc6cf3e771f60c61b9bf2027cb Signed-off-by: Prashant Malani <pmalani@nvidia.com> Reviewed-on: http://git-master/r/394296 Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com> Tested-by: Terje Bergstrom <tbergstrom@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a/gk20a.c')
-rw-r--r--drivers/gpu/nvgpu/gk20a/gk20a.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.c b/drivers/gpu/nvgpu/gk20a/gk20a.c
index 853b6a3c..7e2b9afb 100644
--- a/drivers/gpu/nvgpu/gk20a/gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/gk20a.c
@@ -1227,12 +1227,12 @@ static int gk20a_pm_suspend(struct device *dev)
1227 if (atomic_read(&dev->power.usage_count) > 1) 1227 if (atomic_read(&dev->power.usage_count) > 1)
1228 return -EBUSY; 1228 return -EBUSY;
1229 1229
1230 gk20a_scale_suspend(to_platform_device(dev));
1231
1230 ret = gk20a_pm_prepare_poweroff(dev); 1232 ret = gk20a_pm_prepare_poweroff(dev);
1231 if (ret) 1233 if (ret)
1232 return ret; 1234 return ret;
1233 1235
1234 gk20a_scale_suspend(to_platform_device(dev));
1235
1236 if (platform->suspend) 1236 if (platform->suspend)
1237 platform->suspend(dev); 1237 platform->suspend(dev);
1238 1238