diff options
author | Alex Waterman <alexw@nvidia.com> | 2017-02-03 17:47:02 -0500 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2017-02-21 23:42:49 -0500 |
commit | e99a3dec3a7ac903c20b6843693d53087fb7bcab (patch) | |
tree | d71f031bd6e8e6987bd9023f56120483e294a16b /drivers/gpu/nvgpu/gk20a/gk20a.h | |
parent | 00ba4c0b0b2e8ded7349f419cbfdaf7b124af4b1 (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.h')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/gk20a.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.h b/drivers/gpu/nvgpu/gk20a/gk20a.h index 196af3c1..31b02378 100644 --- a/drivers/gpu/nvgpu/gk20a/gk20a.h +++ b/drivers/gpu/nvgpu/gk20a/gk20a.h | |||
@@ -990,6 +990,7 @@ struct gk20a { | |||
990 | 990 | ||
991 | struct gpu_ops ops; | 991 | struct gpu_ops ops; |
992 | 992 | ||
993 | int irqs_enabled; | ||
993 | int irq_stall; /* can be same as irq_nonstall in case of PCI */ | 994 | int irq_stall; /* can be same as irq_nonstall in case of PCI */ |
994 | int irq_nonstall; | 995 | int irq_nonstall; |
995 | u32 max_ltc_count; | 996 | u32 max_ltc_count; |