From cc793c34cc69fa16fe9d076579004d2369caa3a8 Mon Sep 17 00:00:00 2001 From: Richard Zhao Date: Mon, 21 Sep 2015 10:59:48 -0700 Subject: 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 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 Tested-by: Terje Bergstrom --- drivers/gpu/nvgpu/gk20a/gk20a.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'drivers') 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) #endif /* Be ready for rail-gate after this point */ - gk20a_pm_prepare_poweroff(&pdev->dev); + if (gk20a_gpu_is_virtual(pdev)) + vgpu_pm_prepare_poweroff(&pdev->dev); + else + gk20a_pm_prepare_poweroff(&pdev->dev); } #ifdef CONFIG_PM -- cgit v1.2.2