2 files changed, 5 insertions, 3 deletions

diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.c b/drivers/gpu/nvgpu/gk20a/gk20a.c
index 1091b235..5201b7ed 100644
--- a/drivers/gpu/nvgpu/gk20a/gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/gk20a.c
@@ -904,7 +904,8 @@ int gk20a_pm_finalize_poweron(struct device *dev)
                 gk20a_init_cde_support(g);
 
         enable_irq(g->irq_stall);
-        enable_irq(g->irq_nonstall);
+        if (g->irq_stall != g->irq_nonstall)
+                enable_irq(g->irq_nonstall);
 
 done:
         return err;
@@ -1446,7 +1447,8 @@ static int gk20a_probe(struct platform_device *dev)
                 return err;
         }
         disable_irq(gk20a->irq_stall);
-        disable_irq(gk20a->irq_nonstall);
+        if (gk20a->irq_stall != gk20a->irq_nonstall)
+                disable_irq(gk20a->irq_nonstall);
 
         err = gk20a_user_init(&dev->dev, INTERFACE_NAME);
         if (err)
diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.h b/drivers/gpu/nvgpu/gk20a/gk20a.h
index fb149f56..0887ab5e 100644
--- a/drivers/gpu/nvgpu/gk20a/gk20a.h
+++ b/drivers/gpu/nvgpu/gk20a/gk20a.h
@@ -663,7 +663,7 @@ struct gk20a {
 
         struct gpu_ops ops;
 
-        int irq_stall;
+        int irq_stall; /* can be same as irq_nonstall in case of PCI */
         int irq_nonstall;
         u32 max_ltc_count;
         u32 ltc_count;