diff --git a/drivers/gpu/nvgpu/common/fifo/fifo.c b/drivers/gpu/nvgpu/common/fifo/fifo.c
index aacb26227..00788834b 100644
--- a/drivers/gpu/nvgpu/common/fifo/fifo.c
+++ b/drivers/gpu/nvgpu/common/fifo/fifo.c
@@ -137,8 +137,6 @@ static int nvgpu_fifo_init_locks(struct gk20a *g, struct fifo_gk20a *f)
 		goto destroy_2;
 	}
 
-	nvgpu_spinlock_init(&f->runlist_submit_lock);
-
 	return 0;
 
 destroy_2:
diff --git a/drivers/gpu/nvgpu/common/fifo/runlist.c b/drivers/gpu/nvgpu/common/fifo/runlist.c
index 7da748da0..2edcb0789 100644
--- a/drivers/gpu/nvgpu/common/fifo/runlist.c
+++ b/drivers/gpu/nvgpu/common/fifo/runlist.c
@@ -688,6 +688,8 @@ int nvgpu_runlist_setup_sw(struct gk20a *g)
 
 	nvgpu_log_fn(g, " ");
 
+	nvgpu_spinlock_init(&f->runlist_submit_lock);
+
 	f->runlist_entry_size = g->ops.runlist.entry_size(g);
 	f->num_runlist_entries = g->ops.runlist.length_max(g);
 	f->max_runlists = g->ops.runlist.count_max();