2 files changed, 20 insertions, 0 deletions

diff --git a/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c b/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c
index 45087094..808bf015 100644
--- a/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c
@@ -490,6 +490,7 @@ int gk20a_init_pmu(struct pmu_gk20a *pmu)
 
         mutex_init(&pmu->elpg_mutex);
         mutex_init(&pmu->isr_mutex);
+        mutex_init(&pmu->isr_enable_lock);
         mutex_init(&pmu->pmu_copy_lock);
         mutex_init(&pmu->pmu_seq_lock);
 
@@ -1771,7 +1772,11 @@ int gk20a_init_pmu_setup_hw1(struct gk20a *g)
         int err;
 
         gk20a_dbg_fn("");
+
+        mutex_lock(&pmu->isr_enable_lock);
         pmu_reset(pmu);
+        pmu->isr_enabled = true;
+        mutex_unlock(&pmu->isr_enable_lock);
 
         /* setup apertures - virtual */
         gk20a_writel(g, pwr_fbif_transcfg_r(GK20A_PMU_DMAIDX_UCODE),
@@ -2881,6 +2886,12 @@ void gk20a_pmu_isr(struct gk20a *g)
 
         gk20a_dbg_fn("");
 
+        mutex_lock(&pmu->isr_enable_lock);
+        if (!pmu->isr_enabled) {
+                mutex_unlock(&pmu->isr_enable_lock);
+                return;
+        }
+
         mutex_lock(&pmu->isr_mutex);
 
         mask = gk20a_readl(g, pwr_falcon_irqmask_r()) &
@@ -2893,6 +2904,7 @@ void gk20a_pmu_isr(struct gk20a *g)
         if (!intr || pmu->pmu_state == PMU_STATE_OFF) {
                 gk20a_writel(g, pwr_falcon_irqsclr_r(), intr);
                 mutex_unlock(&pmu->isr_mutex);
+                mutex_unlock(&pmu->isr_enable_lock);
                 return;
         }
 
@@ -2925,6 +2937,7 @@ void gk20a_pmu_isr(struct gk20a *g)
         }
 
         mutex_unlock(&pmu->isr_mutex);
+        mutex_unlock(&pmu->isr_enable_lock);
 }
 
 static bool pmu_validate_cmd(struct pmu_gk20a *pmu, struct pmu_cmd *cmd,
@@ -3342,7 +3355,11 @@ int gk20a_pmu_destroy(struct gk20a *g)
         g->pg_ungating_time_us += (u64)elpg_ungating_time;
         g->pg_gating_cnt += gating_cnt;
 
+        mutex_lock(&pmu->isr_enable_lock);
         pmu_enable(pmu, false);
+        pmu->isr_enabled = false;
+        mutex_unlock(&pmu->isr_enable_lock);
+
         pmu->pmu_state = PMU_STATE_OFF;
         pmu->pmu_ready = false;
         pmu->perfmon_ready = false;
diff --git a/drivers/gpu/nvgpu/gk20a/pmu_gk20a.h b/drivers/gpu/nvgpu/gk20a/pmu_gk20a.h
index 40d41ee9..5c8a3215 100644
--- a/drivers/gpu/nvgpu/gk20a/pmu_gk20a.h
+++ b/drivers/gpu/nvgpu/gk20a/pmu_gk20a.h
@@ -1054,6 +1054,9 @@ struct pmu_gk20a {
         u32 sample_buffer;
 
         struct mutex isr_mutex;
+        struct mutex isr_enable_lock;
+        bool isr_enabled;
+
         bool zbc_ready;
         union {
                 struct pmu_cmdline_args_v0 args_v0;