diff options
author | Richard Zhao <rizhao@nvidia.com> | 2015-09-21 13:59:48 -0400 |
---|---|---|
committer | Terje Bergstrom <tbergstrom@nvidia.com> | 2015-10-06 16:27:52 -0400 |
commit | cc793c34cc69fa16fe9d076579004d2369caa3a8 (patch) | |
tree | 8387cac06731297cff061904b6067de4001d7f64 /drivers/gpu/nvgpu | |
parent | 0125d2a770710ec269c210cd4d21a51c9bb67c33 (diff) |
gpu: nvgpu: let shutdown callback call vgpu_pm_prepare_poweroff for vgpu
It fixed the issue that system hang when reboot.
Bug 1638850
Change-Id: If53a31e86c10b2fce4a22fe4fcf92106d86c95ef
Signed-off-by: Richard Zhao <rizhao@nvidia.com>
Reviewed-on: http://git-master/r/803234
(cherry picked from commit 4dbea2c7037a5244ccb9d6e886023c29ba584892)
Reviewed-on: http://git-master/r/808245
GVS: Gerrit_Virtual_Submit
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
Tested-by: Terje Bergstrom <tbergstrom@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/gk20a.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.c b/drivers/gpu/nvgpu/gk20a/gk20a.c index c606e027..93852c17 100644 --- a/drivers/gpu/nvgpu/gk20a/gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/gk20a.c | |||
@@ -1166,7 +1166,10 @@ static void gk20a_pm_shutdown(struct platform_device *pdev) | |||
1166 | #endif | 1166 | #endif |
1167 | 1167 | ||
1168 | /* Be ready for rail-gate after this point */ | 1168 | /* Be ready for rail-gate after this point */ |
1169 | gk20a_pm_prepare_poweroff(&pdev->dev); | 1169 | if (gk20a_gpu_is_virtual(pdev)) |
1170 | vgpu_pm_prepare_poweroff(&pdev->dev); | ||
1171 | else | ||
1172 | gk20a_pm_prepare_poweroff(&pdev->dev); | ||
1170 | } | 1173 | } |
1171 | 1174 | ||
1172 | #ifdef CONFIG_PM | 1175 | #ifdef CONFIG_PM |