2 files changed, 3 insertions, 27 deletions

diff --git a/drivers/gpu/nvgpu/gk20a/channel_gk20a.c b/drivers/gpu/nvgpu/gk20a/channel_gk20a.c
index dac38739..6d62d888 100644
--- a/drivers/gpu/nvgpu/gk20a/channel_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/channel_gk20a.c
@@ -360,24 +360,6 @@ static void gk20a_wait_until_counter_is_N(
         }
 }
 
-#if defined(CONFIG_GK20A_CYCLE_STATS)
-void gk20a_channel_free_cycle_stats_buffer(struct channel_gk20a *ch)
-{
-        /* disable existing cyclestats buffer */
-        nvgpu_mutex_acquire(&ch->cyclestate.cyclestate_buffer_mutex);
-        if (ch->cyclestate.cyclestate_buffer_handler) {
-                dma_buf_vunmap(ch->cyclestate.cyclestate_buffer_handler,
-                                ch->cyclestate.cyclestate_buffer);
-                dma_buf_put(ch->cyclestate.cyclestate_buffer_handler);
-                ch->cyclestate.cyclestate_buffer_handler = NULL;
-                ch->cyclestate.cyclestate_buffer = NULL;
-                ch->cyclestate.cyclestate_buffer_size = 0;
-        }
-        nvgpu_mutex_release(&ch->cyclestate.cyclestate_buffer_mutex);
-}
-
-#endif
-
 /* call ONLY when no references to the channel exist: after the last put */
 static void gk20a_free_channel(struct channel_gk20a *ch, bool force)
 {
@@ -490,10 +472,6 @@ static void gk20a_free_channel(struct channel_gk20a *ch, bool force)
         nvgpu_big_free(g, ch->gpfifo.pipe);
         memset(&ch->gpfifo, 0, sizeof(struct gpfifo_desc));
 
-#if defined(CONFIG_GK20A_CYCLE_STATS)
-        gk20a_channel_free_cycle_stats_buffer(ch);
-#endif
-
         channel_gk20a_free_priv_cmdbuf(ch);
 
         /* sync must be destroyed before releasing channel vm */
diff --git a/drivers/gpu/nvgpu/gk20a/channel_gk20a.h b/drivers/gpu/nvgpu/gk20a/channel_gk20a.h
index 87ab6202..9d294399 100644
--- a/drivers/gpu/nvgpu/gk20a/channel_gk20a.h
+++ b/drivers/gpu/nvgpu/gk20a/channel_gk20a.h
@@ -253,10 +253,9 @@ struct channel_gk20a {
 
 #if defined(CONFIG_GK20A_CYCLE_STATS)
         struct {
-        void *cyclestate_buffer;
-        u32 cyclestate_buffer_size;
-        struct dma_buf *cyclestate_buffer_handler;
-        struct nvgpu_mutex cyclestate_buffer_mutex;
+                void *cyclestate_buffer;
+                u32 cyclestate_buffer_size;
+                struct nvgpu_mutex cyclestate_buffer_mutex;
         } cyclestate;
 
         struct nvgpu_mutex cs_client_mutex;
@@ -370,7 +369,6 @@ int gk20a_channel_alloc_gpfifo(struct channel_gk20a *c,
                 unsigned int num_entries,
                 unsigned int num_inflight_jobs,
                 u32 flags);
-void gk20a_channel_free_cycle_stats_buffer(struct channel_gk20a *ch);
 
 void gk20a_channel_timeout_restart_all_channels(struct gk20a *g);