1 files changed, 5 insertions, 2 deletions

diff --git a/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c b/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c
index b4fa8f0f..fb772ebd 100644
--- a/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c
@@ -1219,7 +1219,8 @@ static bool gk20a_fifo_set_ctx_mmu_error(struct gk20a *g,
         if (!ch)
                 return verbose;
 
-        if (ch->error_notifier) {
+        mutex_lock(&ch->error_notifier_mutex);
+        if (ch->error_notifier_ref) {
                 u32 err = ch->error_notifier->info32;
                 if (ch->error_notifier->status == 0xffff) {
                         /* If error code is already set, this mmu fault
@@ -1230,10 +1231,12 @@ static bool gk20a_fifo_set_ctx_mmu_error(struct gk20a *g,
                         if (err == NVGPU_CHANNEL_FIFO_ERROR_IDLE_TIMEOUT)
                                 verbose = ch->timeout_debug_dump;
                 } else {
-                        gk20a_set_error_notifier(ch,
+                        gk20a_set_error_notifier_locked(ch,
                                 NVGPU_CHANNEL_FIFO_ERROR_MMU_ERR_FLT);
                 }
         }
+        mutex_unlock(&ch->error_notifier_mutex);
+
         /* mark channel as faulted */
         ch->has_timedout = true;
         wmb();