1 files changed, 4 insertions, 31 deletions

diff --git a/drivers/gpu/nvgpu/common/linux/intr.c b/drivers/gpu/nvgpu/common/linux/intr.c
index 6b4b2dc9..05dd3f2a 100644
--- a/drivers/gpu/nvgpu/common/linux/intr.c
+++ b/drivers/gpu/nvgpu/common/linux/intr.c
@@ -69,11 +69,8 @@ irqreturn_t nvgpu_intr_thread_stall(struct gk20a *g)
 
 irqreturn_t nvgpu_intr_nonstall(struct gk20a *g)
 {
-        u32 mc_intr_1;
+        u32 non_stall_intr_val;
         u32 hw_irq_count;
-        u32 engine_id_idx;
-        u32 active_engine_id = 0;
-        u32 engine_enum = ENGINE_INVAL_GK20A;
         int ops_old, ops_new, ops = 0;
         struct nvgpu_os_linux *l = nvgpu_os_linux_from_gk20a(g);
 
@@ -81,37 +78,13 @@ irqreturn_t nvgpu_intr_nonstall(struct gk20a *g)
                 return IRQ_NONE;
 
         /* not from gpu when sharing irq with others */
-        mc_intr_1 = g->ops.mc.intr_nonstall(g);
-        if (unlikely(!mc_intr_1))
+        non_stall_intr_val = g->ops.mc.intr_nonstall(g);
+        if (unlikely(!non_stall_intr_val))
                 return IRQ_NONE;
 
         g->ops.mc.intr_nonstall_pause(g);
 
-        if (g->ops.mc.is_intr1_pending(g, NVGPU_UNIT_FIFO, mc_intr_1))
-                ops |= gk20a_fifo_nonstall_isr(g);
-
-        for (engine_id_idx = 0; engine_id_idx < g->fifo.num_engines;
-                                                        engine_id_idx++) {
-                struct fifo_engine_info_gk20a *engine_info;
-
-                active_engine_id = g->fifo.active_engines_list[engine_id_idx];
-                engine_info = &g->fifo.engine_info[active_engine_id];
-
-                if (mc_intr_1 & engine_info->intr_mask) {
-                        engine_enum = engine_info->engine_enum;
-                        /* GR Engine */
-                        if (engine_enum == ENGINE_GR_GK20A)
-                                ops |= gk20a_gr_nonstall_isr(g);
-
-                        /* CE Engine */
-                        if (((engine_enum == ENGINE_GRCE_GK20A) ||
-                                (engine_enum == ENGINE_ASYNC_CE_GK20A)) &&
-                                g->ops.ce2.isr_nonstall)
-                                        ops |= g->ops.ce2.isr_nonstall(g,
-                                                engine_info->inst_id,
-                                                engine_info->pri_base);
-                }
-        }
+        ops = g->ops.mc.isr_nonstall(g);
         if (ops) {
                 do {
                         ops_old = atomic_read(&l->nonstall_ops);