nv-tegra-mirror/linux-nvgpu
1
0
Fork 0
mirror of git://nv-tegra.nvidia.com/linux-nvgpu.git synced 2025-12-24 02:22:34 +03:00
Code Issues Packages Projects Releases Wiki Activity

gpu: nvgpu: handle pm_prepare_poweroff failure

Browse Source 
As part of gk20a_pm_prepare_poweroff, gpu hw state
is destroyed even in case of any errors. So try to recover
from that situation by calling gk20a_pm_finalize_poweron.

Bug 200380708

Change-Id: Ibff656cda67241ad111fd22701e05871f20d6f70
Signed-off-by: seshendra Gadagottu <sgadagottu@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1653750
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
This commit is contained in:
seshendra Gadagottu
2018-02-07 13:26:11 -08:00
committed by mobile promotions
parent cb54d7ca8f
commit 244a124ce2
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/gpu/nvgpu/common/linux/module.c
View File

@@ -928,23 +928,25 @@ fail:
static int gk20a_pm_runtime_suspend(struct device *dev) static int gk20a_pm_runtime_suspend(struct device *dev)
{ {
int err = 0; int err = 0;
struct gk20a *g = get_gk20a(dev);
if (gk20a_gpu_is_virtual(dev)) if (gk20a_gpu_is_virtual(dev))
err = vgpu_pm_prepare_poweroff(dev); err = vgpu_pm_prepare_poweroff(dev);
else else
err = gk20a_pm_prepare_poweroff(dev); err = gk20a_pm_prepare_poweroff(dev);
if (err) if (err) {
nvgpu_err(g, "failed to power off, err=%d", err);
goto fail; goto fail;
}
err = gk20a_pm_railgate(dev); err = gk20a_pm_railgate(dev);
if (err) if (err)
goto fail_railgate; goto fail;
return 0; return 0;
fail_railgate:
gk20a_pm_finalize_poweron(dev);
fail: fail:
gk20a_pm_finalize_poweron(dev);
pm_runtime_mark_last_busy(dev); pm_runtime_mark_last_busy(dev);
return err; return err;
} }