1 files changed, 4 insertions, 4 deletions

diff --git a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
index 27406f9e..d085e96f 100644
--- a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
@@ -4626,6 +4626,10 @@ static int gk20a_init_gr_setup_sw(struct gk20a *g)
 
         gr->g = g;
 
+#if defined(CONFIG_GK20A_CYCLE_STATS)
+        mutex_init(&g->gr.cs_lock);
+#endif
+
         err = gr_gk20a_init_gr_config(g, gr);
         if (err)
                 goto clean_up;
@@ -4662,10 +4666,6 @@ static int gk20a_init_gr_setup_sw(struct gk20a *g)
         mutex_init(&gr->ctx_mutex);
         spin_lock_init(&gr->ch_tlb_lock);
 
-#if defined(CONFIG_GK20A_CYCLE_STATS)
-        mutex_init(&g->gr.cs_lock);
-#endif
-
         gr->remove_support = gk20a_remove_gr_support;
         gr->sw_ready = true;