diff options
author | Supriya <ssharatkumar@nvidia.com> | 2015-03-10 03:28:00 -0400 |
---|---|---|
committer | Dan Willemsen <dwillemsen@nvidia.com> | 2015-04-04 21:59:24 -0400 |
commit | 81f5ffbfae535b10df25811ae8074c40e6d77c5a (patch) | |
tree | e2c83691d0f8c456e4343368427e89667719bc43 | |
parent | 2155dfeaba1714bb00cb86af090aa056aec3acfd (diff) |
gpu: nvgpu: Correct irq and elpg disable sequence
Bug 200066741
Change-Id: I873835c8aff0c53ac475090d727754ce1ccca0ee
Signed-off-by: Supriya <ssharatkumar@nvidia.com>
Reviewed-on: http://git-master/r/715632
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/gk20a.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.c b/drivers/gpu/nvgpu/gk20a/gk20a.c index 84fc3e93..f612e43f 100644 --- a/drivers/gpu/nvgpu/gk20a/gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/gk20a.c | |||
@@ -680,6 +680,8 @@ static int gk20a_pm_prepare_poweroff(struct device *dev) | |||
680 | /* cancel any pending cde work */ | 680 | /* cancel any pending cde work */ |
681 | gk20a_cde_suspend(g); | 681 | gk20a_cde_suspend(g); |
682 | 682 | ||
683 | /* disable elpg before gr or fifo suspend */ | ||
684 | ret |= gk20a_pmu_destroy(g); | ||
683 | /* | 685 | /* |
684 | * After this point, gk20a interrupts should not get | 686 | * After this point, gk20a interrupts should not get |
685 | * serviced. | 687 | * serviced. |
@@ -687,8 +689,6 @@ static int gk20a_pm_prepare_poweroff(struct device *dev) | |||
687 | disable_irq(g->irq_stall); | 689 | disable_irq(g->irq_stall); |
688 | disable_irq(g->irq_nonstall); | 690 | disable_irq(g->irq_nonstall); |
689 | 691 | ||
690 | /* disable elpg before gr or fifo suspend */ | ||
691 | ret |= gk20a_pmu_destroy(g); | ||
692 | ret |= gk20a_gr_suspend(g); | 692 | ret |= gk20a_gr_suspend(g); |
693 | ret |= gk20a_mm_suspend(g); | 693 | ret |= gk20a_mm_suspend(g); |
694 | ret |= gk20a_fifo_suspend(g); | 694 | ret |= gk20a_fifo_suspend(g); |