1 files changed, 8 insertions, 5 deletions

diff --git a/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c b/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c
index 997856aa..00119300 100644
--- a/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c
@@ -834,11 +834,14 @@ int gk20a_init_fifo_reset_enable_hw(struct gk20a *g)
                 gk20a_writel(g, pbdma_intr_stall_r(i), intr_stall);
                 nvgpu_log_info(g, "pbdma id:%u, intr_en_0 0x%08x", i, intr_stall);
                 gk20a_writel(g, pbdma_intr_en_0_r(i), intr_stall);
-
-                nvgpu_log_info(g, "pbdma id:%u, intr_en_1 0x%08x", i,
-                                 ~pbdma_intr_en_0_lbreq_enabled_f());
-                gk20a_writel(g, pbdma_intr_en_1_r(i),
-                        ~pbdma_intr_en_0_lbreq_enabled_f());
+                intr_stall = gk20a_readl(g, pbdma_intr_stall_1_r(i));
+                /*
+                 * For bug 2082123
+                 * Mask the unused HCE_RE_ILLEGAL_OP bit from the interrupt.
+                 */
+                intr_stall &= ~pbdma_intr_stall_1_hce_illegal_op_enabled_f();
+                nvgpu_log_info(g, "pbdma id:%u, intr_en_1 0x%08x", i, intr_stall);
+                gk20a_writel(g, pbdma_intr_en_1_r(i), intr_stall);
         }
 
         /* reset runlist interrupts */