3 files changed, 25 insertions, 2 deletions

diff --git a/drivers/gpu/nvgpu/gv11b/hal_gv11b.c b/drivers/gpu/nvgpu/gv11b/hal_gv11b.c
index 08c3097e..0508452c 100644
--- a/drivers/gpu/nvgpu/gv11b/hal_gv11b.c
+++ b/drivers/gpu/nvgpu/gv11b/hal_gv11b.c
@@ -241,6 +241,7 @@ static const struct gpu_ops gv11b_ops = {
                 .isr = gv11b_ltc_isr,
                 .flush = gm20b_flush_ltc,
                 .set_enabled = gp10b_ltc_set_enabled,
+                .intr_en_illegal_compstat = gv11b_ltc_intr_en_illegal_compstat,
         },
         .ce2 = {
                 .isr_stall = gv11b_ce_isr,
diff --git a/drivers/gpu/nvgpu/gv11b/ltc_gv11b.c b/drivers/gpu/nvgpu/gv11b/ltc_gv11b.c
index 3cea4cd4..a040de23 100644
--- a/drivers/gpu/nvgpu/gv11b/ltc_gv11b.c
+++ b/drivers/gpu/nvgpu/gv11b/ltc_gv11b.c
@@ -70,10 +70,13 @@ void gv11b_ltc_init_fs_state(struct gk20a *g)
         /* Disable LTC interrupts */
         reg = gk20a_readl(g, ltc_ltcs_ltss_intr_r());
         reg &= ~ltc_ltcs_ltss_intr_en_evicted_cb_m();
-        reg &= ~ltc_ltcs_ltss_intr_en_illegal_compstat_m();
         reg &= ~ltc_ltcs_ltss_intr_en_illegal_compstat_access_m();
         nvgpu_writel_check(g, ltc_ltcs_ltss_intr_r(), reg);
 
+        if (g->ops.ltc.intr_en_illegal_compstat)
+                g->ops.ltc.intr_en_illegal_compstat(g,
+                                        g->ltc_intr_en_illegal_compstat);
+
         /* Enable ECC interrupts */
         ltc_intr = gk20a_readl(g, ltc_ltcs_ltss_intr_r());
         ltc_intr |= ltc_ltcs_ltss_intr_en_ecc_sec_error_enabled_f() |
@@ -82,6 +85,24 @@ void gv11b_ltc_init_fs_state(struct gk20a *g)
                                 ltc_intr);
 }
 
+void gv11b_ltc_intr_en_illegal_compstat(struct gk20a *g, bool enable)
+{
+        u32 val;
+
+        /* disble/enble illegal_compstat interrupt */
+        val = gk20a_readl(g, ltc_ltcs_ltss_intr_r());
+        if (enable)
+                val = set_field(val,
+                        ltc_ltcs_ltss_intr_en_illegal_compstat_m(),
+                        ltc_ltcs_ltss_intr_en_illegal_compstat_enabled_f());
+        else
+                val = set_field(val,
+                        ltc_ltcs_ltss_intr_en_illegal_compstat_m(),
+                        ltc_ltcs_ltss_intr_en_illegal_compstat_disabled_f());
+        gk20a_writel(g, ltc_ltcs_ltss_intr_r(), val);
+}
+
+
 void gv11b_ltc_isr(struct gk20a *g)
 {
         u32 mc_intr, ltc_intr3;
diff --git a/drivers/gpu/nvgpu/gv11b/ltc_gv11b.h b/drivers/gpu/nvgpu/gv11b/ltc_gv11b.h
index 8309e662..9d33b9fb 100644
--- a/drivers/gpu/nvgpu/gv11b/ltc_gv11b.h
+++ b/drivers/gpu/nvgpu/gv11b/ltc_gv11b.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2016-2018, NVIDIA CORPORATION.  All rights reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -28,6 +28,7 @@ void gv11b_ltc_set_zbc_stencil_entry(struct gk20a *g,
                                           struct zbc_entry *stencil_val,
                                           u32 index);
 void gv11b_ltc_init_fs_state(struct gk20a *g);
+void gv11b_ltc_intr_en_illegal_compstat(struct gk20a *g, bool enable);
 void gv11b_ltc_isr(struct gk20a *g);
 
 #endif