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>
This commit is contained in:
Alex Waterman
2017-02-03 14:47:02 -08:00
committed by mobile promotions
parent 00ba4c0b0b
commit e99a3dec3a
3 changed files with 5 additions and 1 deletions

View File

@@ -439,7 +439,9 @@ static void nvgpu_pci_remove(struct pci_dev *pdev)
gk20a_dbg(gpu_dbg_shutdown, "Removing nvgpu driver!\n");
gk20a_driver_start_unload(g);
disable_irq(g->irq_stall);
if (g->irqs_enabled)
disable_irq(g->irq_stall);
devm_free_irq(&pdev->dev, g->irq_stall, g);
#if defined(CONFIG_PCI_MSI)