diff --git a/drivers/gpu/nvgpu/common/fifo/tsg.c b/drivers/gpu/nvgpu/common/fifo/tsg.c
index 5864fc287..2cef097c4 100644
--- a/drivers/gpu/nvgpu/common/fifo/tsg.c
+++ b/drivers/gpu/nvgpu/common/fifo/tsg.c
@@ -21,6 +21,7 @@
  */
 
 #include <nvgpu/bug.h>
+#include <nvgpu/debug.h>
 #include <nvgpu/kmem.h>
 #include <nvgpu/log.h>
 #include <nvgpu/os_sched.h>
@@ -29,6 +30,8 @@
 #include <nvgpu/gk20a.h>
 #include <nvgpu/error_notifier.h>
 
+#include "gk20a/gr_gk20a.h"
+
 bool gk20a_is_channel_marked_as_tsg(struct channel_gk20a *ch)
 {
 	return !(ch->tsgid == NVGPU_INVALID_TSG_ID);
@@ -183,6 +186,35 @@ int gk20a_tsg_unbind_channel(struct channel_gk20a *ch)
 	return 0;
 }
 
+
+void nvgpu_tsg_recover(struct gk20a *g, struct tsg_gk20a *tsg,
+			 bool verbose, u32 rc_type)
+{
+	u32 engines;
+
+	/* stop context switching to prevent engine assignments from
+	   changing until TSG is recovered */
+	nvgpu_mutex_acquire(&g->dbg_sessions_lock);
+	gr_gk20a_disable_ctxsw(g);
+
+	engines = g->ops.fifo.get_engines_mask_on_id(g, tsg->tsgid, true);
+
+	if (engines != 0U) {
+		gk20a_fifo_recover(g, engines, tsg->tsgid, true, true, verbose,
+					rc_type);
+	} else {
+		if (nvgpu_tsg_mark_error(g, tsg) && verbose) {
+			gk20a_debug_dump(g);
+		}
+
+		gk20a_fifo_abort_tsg(g, tsg, false);
+	}
+
+	gr_gk20a_enable_ctxsw(g);
+	nvgpu_mutex_release(&g->dbg_sessions_lock);
+}
+
+
 int gk20a_init_tsg_support(struct gk20a *g, u32 tsgid)
 {
 	struct tsg_gk20a *tsg = NULL;
diff --git a/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c b/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c
index 636730594..208bfad6a 100644
--- a/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c
@@ -1822,33 +1822,6 @@ u32 gk20a_fifo_engines_on_id(struct gk20a *g, u32 id, bool is_tsg)
 	return engines;
 }
 
-void gk20a_fifo_recover_tsg(struct gk20a *g, struct tsg_gk20a *tsg,
-			 bool verbose, u32 rc_type)
-{
-	u32 engines;
-
-	/* stop context switching to prevent engine assignments from
-	   changing until TSG is recovered */
-	nvgpu_mutex_acquire(&g->dbg_sessions_lock);
-	gr_gk20a_disable_ctxsw(g);
-
-	engines = g->ops.fifo.get_engines_mask_on_id(g, tsg->tsgid, true);
-
-	if (engines != 0U) {
-		gk20a_fifo_recover(g, engines, tsg->tsgid, true, true, verbose,
-					rc_type);
-	} else {
-		if (nvgpu_tsg_mark_error(g, tsg) && verbose) {
-			gk20a_debug_dump(g);
-		}
-
-		gk20a_fifo_abort_tsg(g, tsg, false);
-	}
-
-	gr_gk20a_enable_ctxsw(g);
-	nvgpu_mutex_release(&g->dbg_sessions_lock);
-}
-
 void gk20a_fifo_teardown_ch_tsg(struct gk20a *g, u32 __engine_ids,
 			u32 hw_id, unsigned int id_type, unsigned int rc_type,
 			 struct mmu_fault_info *mmfault)
@@ -1993,8 +1966,7 @@ int gk20a_fifo_force_reset_ch(struct channel_gk20a *ch,
 		}
 
 		nvgpu_rwsem_up_read(&tsg->ch_list_lock);
-		gk20a_fifo_recover_tsg(g, tsg, verbose,
-				RC_TYPE_FORCE_RESET);
+		nvgpu_tsg_recover(g, tsg, verbose, RC_TYPE_FORCE_RESET);
 	} else {
 		g->ops.fifo.set_error_notifier(ch, err_code);
 		nvgpu_channel_recover(g, ch, verbose,
@@ -2467,7 +2439,7 @@ static void gk20a_fifo_pbdma_fault_rc(struct gk20a *g,
 			}
 		}
 		nvgpu_rwsem_up_read(&tsg->ch_list_lock);
-		gk20a_fifo_recover_tsg(g, tsg, true, RC_TYPE_PBDMA_FAULT);
+		nvgpu_tsg_recover(g, tsg, true, RC_TYPE_PBDMA_FAULT);
 	}
 }
 
@@ -2652,7 +2624,7 @@ void gk20a_fifo_preempt_timeout_rc_tsg(struct gk20a *g, struct tsg_gk20a *tsg)
 		gk20a_channel_put(ch);
 	}
 	nvgpu_rwsem_up_read(&tsg->ch_list_lock);
-	gk20a_fifo_recover_tsg(g, tsg, true, RC_TYPE_PREEMPT_TIMEOUT);
+	nvgpu_tsg_recover(g, tsg, true, RC_TYPE_PREEMPT_TIMEOUT);
 }
 
 void gk20a_fifo_preempt_timeout_rc(struct gk20a *g, struct channel_gk20a *ch)
diff --git a/drivers/gpu/nvgpu/gk20a/fifo_gk20a.h b/drivers/gpu/nvgpu/gk20a/fifo_gk20a.h
index 5d2094a8b..9280b8ba1 100644
--- a/drivers/gpu/nvgpu/gk20a/fifo_gk20a.h
+++ b/drivers/gpu/nvgpu/gk20a/fifo_gk20a.h
@@ -287,8 +287,6 @@ void gk20a_fifo_recover(struct gk20a *g,
 			u32 hw_id, /* if ~0, will be queried from HW */
 			bool id_is_tsg, /* ignored if hw_id == ~0 */
 			bool id_is_known, bool verbose, u32 rc_type);
-void gk20a_fifo_recover_tsg(struct gk20a *g, struct tsg_gk20a *tsg,
-			 bool verbose, u32 rc_type);
 int gk20a_fifo_force_reset_ch(struct channel_gk20a *ch,
 				u32 err_code, bool verbose);
 void gk20a_fifo_reset_engine(struct gk20a *g, u32 engine_id);
diff --git a/drivers/gpu/nvgpu/include/nvgpu/tsg.h b/drivers/gpu/nvgpu/include/nvgpu/tsg.h
index fde04b8d9..25fda80ef 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/tsg.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/tsg.h
@@ -94,6 +94,8 @@ int gk20a_disable_tsg(struct tsg_gk20a *tsg);
 int gk20a_tsg_bind_channel(struct tsg_gk20a *tsg,
 			struct channel_gk20a *ch);
 int gk20a_tsg_unbind_channel(struct channel_gk20a *ch);
+void nvgpu_tsg_recover(struct gk20a *g, struct tsg_gk20a *tsg,
+			 bool verbose, u32 rc_type);
 
 void nvgpu_tsg_set_ctx_mmu_error(struct gk20a *g,
 		struct tsg_gk20a *tsg);