diff options
Diffstat (limited to 'drivers/gpu/nvgpu/pci.c')
-rw-r--r-- | drivers/gpu/nvgpu/pci.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/gpu/nvgpu/pci.c b/drivers/gpu/nvgpu/pci.c index 39559dac..69e16267 100644 --- a/drivers/gpu/nvgpu/pci.c +++ b/drivers/gpu/nvgpu/pci.c | |||
@@ -236,8 +236,7 @@ static irqreturn_t nvgpu_pci_isr(int irq, void *dev_id) | |||
236 | g->ops.xve.rearm_msi(g); | 236 | g->ops.xve.rearm_msi(g); |
237 | #endif | 237 | #endif |
238 | 238 | ||
239 | return (ret_stall == IRQ_NONE && ret_nonstall == IRQ_NONE) ? | 239 | return (ret_stall == IRQ_NONE) ? ret_nonstall : IRQ_WAKE_THREAD; |
240 | IRQ_NONE : IRQ_WAKE_THREAD; | ||
241 | } | 240 | } |
242 | 241 | ||
243 | static irqreturn_t nvgpu_pci_intr_thread(int irq, void *dev_id) | 242 | static irqreturn_t nvgpu_pci_intr_thread(int irq, void *dev_id) |
@@ -245,7 +244,6 @@ static irqreturn_t nvgpu_pci_intr_thread(int irq, void *dev_id) | |||
245 | struct gk20a *g = dev_id; | 244 | struct gk20a *g = dev_id; |
246 | 245 | ||
247 | g->ops.mc.isr_thread_stall(g); | 246 | g->ops.mc.isr_thread_stall(g); |
248 | g->ops.mc.isr_thread_nonstall(g); | ||
249 | 247 | ||
250 | return IRQ_HANDLED; | 248 | return IRQ_HANDLED; |
251 | } | 249 | } |