From 0aa8d6e27394ec15c1816943996daf8f8ffab438 Mon Sep 17 00:00:00 2001 From: Vinod G Date: Mon, 11 Jun 2018 20:11:43 -0700 Subject: gpu: nvgpu: Mask an unused HCE_ILLEGAL_OP Interrupt HCE interrupt is not being used in nvgpu platform now, masking the bit from the interrupt register. bug 2082123 Change-Id: I1d53584afebe57b9621c8f4ec395cd1dcd6c7611 Signed-off-by: Vinod G Reviewed-on: https://git-master.nvidia.com/r/1746850 Reviewed-by: Terje Bergstrom Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/gk20a/fifo_gk20a.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'drivers/gpu/nvgpu/gk20a/fifo_gk20a.c') 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 */ -- cgit v1.2.2