diff --git a/drivers/gpu/nvgpu/common/fifo/channel.c b/drivers/gpu/nvgpu/common/fifo/channel.c
index fb4888f2f..513afa9b9 100644
--- a/drivers/gpu/nvgpu/common/fifo/channel.c
+++ b/drivers/gpu/nvgpu/common/fifo/channel.c
@@ -46,6 +46,7 @@
 #include <nvgpu/gk20a.h>
 #include <nvgpu/gr/ctx.h>
 #include <nvgpu/gr/subctx.h>
+#include <nvgpu/gr/gr.h>
 #include <nvgpu/channel.h>
 #include <nvgpu/channel_sync.h>
 #include <nvgpu/runlist.h>
@@ -323,7 +324,6 @@ static void gk20a_free_channel(struct channel_gk20a *ch, bool force)
 {
 	struct gk20a *g = ch->g;
 	struct fifo_gk20a *f = &g->fifo;
-	struct gr_gk20a *gr = &g->gr;
 	struct vm_gk20a *ch_vm = ch->vm;
 	unsigned long timeout = gk20a_get_gr_idle_timeout(g);
 	struct dbg_session_gk20a *dbg_s;
@@ -438,7 +438,7 @@ static void gk20a_free_channel(struct channel_gk20a *ch, bool force)
 		ch->usermode_submit_enabled = false;
 	}
 
-	gk20a_gr_flush_channel_tlb(gr);
+	nvgpu_gr_flush_channel_tlb(g);
 
 	nvgpu_dma_unmap_free(ch_vm, &ch->gpfifo.mem);
 	nvgpu_big_free(g, ch->gpfifo.pipe);
diff --git a/drivers/gpu/nvgpu/common/gr/gr.c b/drivers/gpu/nvgpu/common/gr/gr.c
index 9b86f0c3a..f06f98f34 100644
--- a/drivers/gpu/nvgpu/common/gr/gr.c
+++ b/drivers/gpu/nvgpu/common/gr/gr.c
@@ -79,6 +79,16 @@ static void gr_load_tpc_mask(struct gk20a *g)
 	g->ops.gr.init.tpc_mask(g, 0, pes_tpc_mask);
 }
 
+/* invalidate channel lookup tlb */
+void nvgpu_gr_flush_channel_tlb(struct gk20a *g)
+{
+	nvgpu_spinlock_acquire(&g->gr.ch_tlb_lock);
+	(void) memset(g->gr.chid_tlb, 0,
+		sizeof(struct gr_channel_map_tlb_entry) *
+		GR_CHANNEL_MAP_TLB_SIZE);
+	nvgpu_spinlock_release(&g->gr.ch_tlb_lock);
+}
+
 u32 nvgpu_gr_get_idle_timeout(struct gk20a *g)
 {
 	return nvgpu_is_timeouts_enabled(g) ?
diff --git a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
index 1f534cdbf..bd9253ef9 100644
--- a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
@@ -3831,7 +3831,7 @@ int gk20a_gr_suspend(struct gk20a *g)
 	/* disable all exceptions */
 	g->ops.gr.intr.enable_exceptions(g, g->gr.config, false);
 
-	gk20a_gr_flush_channel_tlb(&g->gr);
+	nvgpu_gr_flush_channel_tlb(g);
 
 	g->gr.initialized = false;
 
@@ -5909,16 +5909,6 @@ u32 gk20a_gr_get_sm_no_lock_down_hww_global_esr_mask(struct gk20a *g)
 	return global_esr_mask;
 }
 
-/* invalidate channel lookup tlb */
-void gk20a_gr_flush_channel_tlb(struct gr_gk20a *gr)
-{
-	nvgpu_spinlock_acquire(&gr->ch_tlb_lock);
-	(void) memset(gr->chid_tlb, 0,
-		sizeof(struct gr_channel_map_tlb_entry) *
-		GR_CHANNEL_MAP_TLB_SIZE);
-	nvgpu_spinlock_release(&gr->ch_tlb_lock);
-}
-
 u32 gk20a_gr_get_fecs_ctx_state_store_major_rev_id(struct gk20a *g)
 {
 	return nvgpu_readl(g, gr_fecs_ctx_state_store_major_rev_id_r());
diff --git a/drivers/gpu/nvgpu/gk20a/gr_gk20a.h b/drivers/gpu/nvgpu/gk20a/gr_gk20a.h
index d9262c88d..e4d32608f 100644
--- a/drivers/gpu/nvgpu/gk20a/gr_gk20a.h
+++ b/drivers/gpu/nvgpu/gk20a/gr_gk20a.h
@@ -493,7 +493,6 @@ void gk20a_gr_destroy_ctx_buffer(struct gk20a *g,
 	struct gr_ctx_buffer_desc *desc);
 int gk20a_gr_alloc_ctx_buffer(struct gk20a *g,
 	struct gr_ctx_buffer_desc *desc, size_t size);
-void gk20a_gr_flush_channel_tlb(struct gr_gk20a *gr);
 
 u32 gk20a_gr_get_fecs_ctx_state_store_major_rev_id(struct gk20a *g);
 u32 gr_gk20a_fecs_falcon_base_addr(void);
diff --git a/drivers/gpu/nvgpu/include/nvgpu/gr/gr.h b/drivers/gpu/nvgpu/include/nvgpu/gr/gr.h
index ee2b5c566..5c9c705fa 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/gr/gr.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/gr/gr.h
@@ -28,6 +28,7 @@
 #define NVGPU_GR_IDLE_CHECK_DEFAULT_US		10U
 #define NVGPU_GR_IDLE_CHECK_MAX_US		200U
 
+void nvgpu_gr_flush_channel_tlb(struct gk20a *g);
 u32 nvgpu_gr_get_idle_timeout(struct gk20a *g);
 int nvgpu_gr_init_fs_state(struct gk20a *g);