1 files changed, 7 insertions, 0 deletions

diff --git a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
index 7c007622..85d1a886 100644
--- a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
@@ -2847,6 +2847,8 @@ static void gk20a_remove_gr_support(struct gr_gk20a *gr)
 
         gk20a_dbg_fn("");
 
+        gr_gk20a_free_cyclestats_snapshot_data(g);
+
         gr_gk20a_free_global_ctx_buffers(g);
 
         gk20a_gmmu_free(g, &gr->mmu_wr_mem);
@@ -4523,6 +4525,11 @@ int gk20a_init_gr_support(struct gk20a *g)
 
         gk20a_dbg_fn("");
 
+#if defined(CONFIG_GK20A_CYCLE_STATS)
+        mutex_init(&g->gr.cs_lock);
+        g->gr.cs_data = NULL;
+#endif
+
         /* this is required before gr_gk20a_init_ctx_state */
         mutex_init(&g->gr.fecs_mutex);