diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/gk20a.c | 6 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/gk20a.h | 2 |
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) | |||
904 | gk20a_init_cde_support(g); | 904 | gk20a_init_cde_support(g); |
905 | 905 | ||
906 | enable_irq(g->irq_stall); | 906 | enable_irq(g->irq_stall); |
907 | enable_irq(g->irq_nonstall); | 907 | if (g->irq_stall != g->irq_nonstall) |
908 | enable_irq(g->irq_nonstall); | ||
908 | 909 | ||
909 | done: | 910 | done: |
910 | return err; | 911 | return err; |
@@ -1446,7 +1447,8 @@ static int gk20a_probe(struct platform_device *dev) | |||
1446 | return err; | 1447 | return err; |
1447 | } | 1448 | } |
1448 | disable_irq(gk20a->irq_stall); | 1449 | disable_irq(gk20a->irq_stall); |
1449 | disable_irq(gk20a->irq_nonstall); | 1450 | if (gk20a->irq_stall != gk20a->irq_nonstall) |
1451 | disable_irq(gk20a->irq_nonstall); | ||
1450 | 1452 | ||
1451 | err = gk20a_user_init(&dev->dev, INTERFACE_NAME); | 1453 | err = gk20a_user_init(&dev->dev, INTERFACE_NAME); |
1452 | if (err) | 1454 | 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 { | |||
663 | 663 | ||
664 | struct gpu_ops ops; | 664 | struct gpu_ops ops; |
665 | 665 | ||
666 | int irq_stall; | 666 | int irq_stall; /* can be same as irq_nonstall in case of PCI */ |
667 | int irq_nonstall; | 667 | int irq_nonstall; |
668 | u32 max_ltc_count; | 668 | u32 max_ltc_count; |
669 | u32 ltc_count; | 669 | u32 ltc_count; |