summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu/gk20a/gk20a.c
diff options
context:
space:
mode:
authorAlex Waterman <alexw@nvidia.com>2017-02-03 17:47:02 -0500
committermobile promotions <svcmobile_promotions@nvidia.com>2017-02-21 23:42:49 -0500
commite99a3dec3a7ac903c20b6843693d53087fb7bcab (patch)
treed71f031bd6e8e6987bd9023f56120483e294a16b /drivers/gpu/nvgpu/gk20a/gk20a.c
parent00ba4c0b0b2e8ded7349f419cbfdaf7b124af4b1 (diff)
gpu: nvgpu: Disable IRQs only if enabled
In the PCI init/de-init code only disable IRQs if they were enabled. The enable happens in the common power_on code. The PCI routines could both be called without the common power_on code being called which causes an extra disable to happen. Bug 200275531 Change-Id: I43a8a9881f1e9ae254bf36230f29849df074657f Signed-off-by: Alex Waterman <alexw@nvidia.com> Reviewed-on: http://git-master/r/1301701 (cherry picked from commit cca70e9adccee1ef65a0a6d95a4494fc87500c17) Reviewed-on: http://git-master/r/1298954 Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com> Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a/gk20a.c')
-rw-r--r--drivers/gpu/nvgpu/gk20a/gk20a.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.c b/drivers/gpu/nvgpu/gk20a/gk20a.c
index 91c82104..79c3fd09 100644
--- a/drivers/gpu/nvgpu/gk20a/gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/gk20a.c
@@ -1098,6 +1098,7 @@ int gk20a_pm_finalize_poweron(struct device *dev)
1098 enable_irq(g->irq_stall); 1098 enable_irq(g->irq_stall);
1099 if (g->irq_stall != g->irq_nonstall) 1099 if (g->irq_stall != g->irq_nonstall)
1100 enable_irq(g->irq_nonstall); 1100 enable_irq(g->irq_nonstall);
1101 g->irqs_enabled = 1;
1101 1102
1102 if (g->ops.xve.available_speeds) { 1103 if (g->ops.xve.available_speeds) {
1103 u32 speed; 1104 u32 speed;