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

Revert "gpu: nvgpu: reorder disable_irq"

Browse Source 
This reverts commit 6bbc169d33.

channel_suspend() might cause new interrupts to trigger,
and if irqs are already disabled, then these interrupts will
not get served

Hence revert this patch, and move disable_irq() to
original place

Bug 200207867

Change-Id: I45617a1a0aa9a1f805dd937a34ebb572a61c05c0
Signed-off-by: Deepak Nibade <dnibade@nvidia.com>
Reviewed-on: http://git-master/r/1169380
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
Tested-by: Bharat Nihalani <bnihalani@nvidia.com>
This commit is contained in:
Deepak Nibade
2016-06-22 17:51:20 +05:30
committed by Bharat Nihalani
parent a79135eacb
commit fa4b21f604
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/gpu/nvgpu/gk20a/gk20a.c
View File

@@ -705,13 +705,6 @@ static int gk20a_pm_prepare_poweroff(struct device *dev)
if (!g->power_on)
goto done;
/*
* After this point, gk20a interrupts should not get
* serviced.
*/
disable_irq(g->irq_stall);
disable_irq(g->irq_nonstall);
gk20a_scale_suspend(dev);
/* cancel any pending cde work */
@@ -723,6 +716,12 @@ static int gk20a_pm_prepare_poweroff(struct device *dev)
/* disable elpg before gr or fifo suspend */
ret |= gk20a_pmu_destroy(g);
/*
* After this point, gk20a interrupts should not get
* serviced.
*/
disable_irq(g->irq_stall);
disable_irq(g->irq_nonstall);
ret |= gk20a_gr_suspend(g);
ret |= gk20a_mm_suspend(g);