2 files changed, 4 insertions, 1 deletions

diff --git a/drivers/gpu/nvgpu/vgpu/fifo_vgpu.c b/drivers/gpu/nvgpu/vgpu/fifo_vgpu.c
index 7b6ed322..027a92fc 100644
--- a/drivers/gpu/nvgpu/vgpu/fifo_vgpu.c
+++ b/drivers/gpu/nvgpu/vgpu/fifo_vgpu.c
@@ -308,6 +308,10 @@ static int vgpu_init_fifo_setup_sw(struct gk20a *g)
         }
         nvgpu_mutex_init(&f->tsg_inuse_mutex);
 
+        err = nvgpu_channel_worker_init(g);
+        if (err)
+                goto clean_up;
+
         f->deferred_reset_pending = false;
         nvgpu_mutex_init(&f->deferred_reset_mutex);
 
diff --git a/drivers/gpu/nvgpu/vgpu/vgpu.c b/drivers/gpu/nvgpu/vgpu/vgpu.c
index 4c88ab96..c8ab23f1 100644
--- a/drivers/gpu/nvgpu/vgpu/vgpu.c
+++ b/drivers/gpu/nvgpu/vgpu/vgpu.c
@@ -252,7 +252,6 @@ static int vgpu_init_support(struct platform_device *pdev)
 
         nvgpu_mutex_init(&g->dbg_sessions_lock);
         nvgpu_mutex_init(&g->client_lock);
-        nvgpu_mutex_init(&g->ch_wdt_lock);
 
         g->dbg_regops_tmp_buf = kzalloc(SZ_4K, GFP_KERNEL);
         if (!g->dbg_regops_tmp_buf) {