2 files changed, 5 insertions, 5 deletions

diff --git a/drivers/gpu/nvgpu/vgpu/fifo_vgpu.c b/drivers/gpu/nvgpu/vgpu/fifo_vgpu.c
index 234f6fd4..4055d5af 100644
--- a/drivers/gpu/nvgpu/vgpu/fifo_vgpu.c
+++ b/drivers/gpu/nvgpu/vgpu/fifo_vgpu.c
@@ -651,7 +651,7 @@ int vgpu_fifo_force_reset_ch(struct channel_gk20a *ch,
                         if (gk20a_channel_get(ch_tsg)) {
                                 g->ops.fifo.set_error_notifier(ch_tsg,
                                                                 err_code);
-                                ch_tsg->has_timedout = true;
+                                gk20a_channel_set_timedout(ch_tsg);
                                 gk20a_channel_put(ch_tsg);
                         }
                 }
@@ -659,7 +659,7 @@ int vgpu_fifo_force_reset_ch(struct channel_gk20a *ch,
                 nvgpu_rwsem_up_read(&tsg->ch_list_lock);
         } else {
                 g->ops.fifo.set_error_notifier(ch, err_code);
-                ch->has_timedout = true;
+                gk20a_channel_set_timedout(ch);
         }
 
         msg.cmd = TEGRA_VGPU_CMD_CHANNEL_FORCE_RESET;
@@ -685,8 +685,8 @@ static void vgpu_fifo_set_ctx_mmu_error_ch(struct gk20a *g,
                 NVGPU_ERR_NOTIFIER_FIFO_ERROR_MMU_ERR_FLT);
 
         /* mark channel as faulted */
-        ch->has_timedout = true;
-        nvgpu_smp_wmb();
+        gk20a_channel_set_timedout(ch);
+
         /* unblock pending waits */
         nvgpu_cond_broadcast_interruptible(&ch->semaphore_wq);
         nvgpu_cond_broadcast_interruptible(&ch->notifier_wq);
diff --git a/drivers/gpu/nvgpu/vgpu/vgpu.c b/drivers/gpu/nvgpu/vgpu/vgpu.c
index 07361afe..c17a16df 100644
--- a/drivers/gpu/nvgpu/vgpu/vgpu.c
+++ b/drivers/gpu/nvgpu/vgpu/vgpu.c
@@ -126,7 +126,7 @@ static void vgpu_channel_abort_cleanup(struct gk20a *g, u32 chid)
                 return;
         }
 
-        ch->has_timedout = true;
+        gk20a_channel_set_timedout(ch);
         g->ops.fifo.ch_abort_clean_up(ch);
         gk20a_channel_put(ch);
 }