diff --git a/drivers/gpu/nvgpu/Makefile b/drivers/gpu/nvgpu/Makefile
index bf02affe4..4e08cd513 100644
--- a/drivers/gpu/nvgpu/Makefile
+++ b/drivers/gpu/nvgpu/Makefile
@@ -224,6 +224,7 @@ nvgpu-y += \
 	common/sim_pci.o \
 	common/fifo/channel.o \
 	common/fifo/submit.o \
+	common/fifo/tsg.o \
 	common/ecc.o \
 	common/ce2.o \
 	gk20a/gk20a.o \
@@ -238,7 +239,6 @@ nvgpu-y += \
 	gk20a/fence_gk20a.o \
 	gk20a/gr_ctx_gk20a_sim.o \
 	gk20a/gr_ctx_gk20a.o \
-	gk20a/tsg_gk20a.o \
 	gk20a/fecs_trace_gk20a.o \
 	gm20b/hal_gm20b.o \
 	gm20b/gr_gm20b.o \
diff --git a/drivers/gpu/nvgpu/Makefile.sources b/drivers/gpu/nvgpu/Makefile.sources
index 4e67434d2..4283a01c8 100644
--- a/drivers/gpu/nvgpu/Makefile.sources
+++ b/drivers/gpu/nvgpu/Makefile.sources
@@ -40,7 +40,7 @@ srcs :=	os/posix/nvgpu.c \
 	os/posix/fuse.c \
 	os/posix/clk_arb.c \
 	os/posix/posix-channel.c \
-	os/posix/tsg.c \
+	os/posix/posix-tsg.c \
 	os/posix/nvlink.c \
 	os/posix/lock.c \
 	os/posix/stubs.c \
@@ -109,6 +109,7 @@ srcs :=	os/posix/nvgpu.c \
 	common/clock_gating/gv100_gating_reglist.c \
 	common/fifo/channel.c \
 	common/fifo/submit.c \
+	common/fifo/tsg.c \
 	common/mc/mc.c \
 	common/mc/mc_gm20b.c \
 	common/mc/mc_gp10b.c  \
@@ -158,7 +159,6 @@ srcs :=	os/posix/nvgpu.c \
 	gk20a/fence_gk20a.c \
 	gk20a/gr_ctx_gk20a_sim.c \
 	gk20a/gr_ctx_gk20a.c \
-	gk20a/tsg_gk20a.c \
 	gm20b/hal_gm20b.c \
 	gm20b/gr_gm20b.c \
 	gm20b/clk_gm20b.c \
diff --git a/drivers/gpu/nvgpu/gk20a/tsg_gk20a.c b/drivers/gpu/nvgpu/common/fifo/tsg.c
similarity index 99%
rename from drivers/gpu/nvgpu/gk20a/tsg_gk20a.c
rename to drivers/gpu/nvgpu/common/fifo/tsg.c
index 885ce172b..0892e8bff 100644
--- a/drivers/gpu/nvgpu/gk20a/tsg_gk20a.c
+++ b/drivers/gpu/nvgpu/common/fifo/tsg.c
@@ -24,9 +24,8 @@
 #include <nvgpu/log.h>
 #include <nvgpu/os_sched.h>
 #include <nvgpu/channel.h>
-
-#include "gk20a.h"
-#include "tsg_gk20a.h"
+#include <nvgpu/tsg.h>
+#include <nvgpu/gk20a.h>
 
 bool gk20a_is_channel_marked_as_tsg(struct channel_gk20a *ch)
 {
diff --git a/drivers/gpu/nvgpu/gm20b/hal_gm20b.c b/drivers/gpu/nvgpu/gm20b/hal_gm20b.c
index 133428dad..427403e35 100644
--- a/drivers/gpu/nvgpu/gm20b/hal_gm20b.c
+++ b/drivers/gpu/nvgpu/gm20b/hal_gm20b.c
@@ -28,6 +28,7 @@
 #include <nvgpu/error_notifier.h>
 #include <nvgpu/gk20a.h>
 #include <nvgpu/channel.h>
+#include <nvgpu/tsg.h>
 
 #include "common/clock_gating/gm20b_gating_reglist.h"
 #include "common/bus/bus_gm20b.h"
@@ -50,7 +51,6 @@
 #include "gk20a/regops_gk20a.h"
 #include "gk20a/pmu_gk20a.h"
 #include "gk20a/gr_gk20a.h"
-#include "gk20a/tsg_gk20a.h"
 
 #include "gr_gm20b.h"
 #include "fifo_gm20b.h"
diff --git a/drivers/gpu/nvgpu/gp10b/hal_gp10b.c b/drivers/gpu/nvgpu/gp10b/hal_gp10b.c
index 740cb8b7c..68dfcfe49 100644
--- a/drivers/gpu/nvgpu/gp10b/hal_gp10b.c
+++ b/drivers/gpu/nvgpu/gp10b/hal_gp10b.c
@@ -29,6 +29,7 @@
 #include <nvgpu/error_notifier.h>
 #include <nvgpu/gk20a.h>
 #include <nvgpu/channel.h>
+#include <nvgpu/tsg.h>
 
 #include "common/bus/bus_gk20a.h"
 #include "common/clock_gating/gp10b_gating_reglist.h"
@@ -57,7 +58,6 @@
 #include "gk20a/regops_gk20a.h"
 #include "gk20a/pmu_gk20a.h"
 #include "gk20a/gr_gk20a.h"
-#include "gk20a/tsg_gk20a.h"
 
 #include "gp10b/gr_gp10b.h"
 #include "gp10b/fecs_trace_gp10b.h"
diff --git a/drivers/gpu/nvgpu/include/nvgpu/gk20a.h b/drivers/gpu/nvgpu/include/nvgpu/gk20a.h
index 2fd533c66..ad77f8025 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/gk20a.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/gk20a.h
@@ -66,11 +66,11 @@ struct nvgpu_gpfifo_args;
 #include <nvgpu/nvlink.h>
 #include <nvgpu/sim.h>
 #include <nvgpu/ecc.h>
+#include <nvgpu/tsg.h>
 
 #include "gk20a/clk_gk20a.h"
 #include "gk20a/ce2_gk20a.h"
 #include "gk20a/fifo_gk20a.h"
-#include "gk20a/tsg_gk20a.h"
 #include "clk/clk.h"
 #include "perf/perf.h"
 #include "pmgr/pmgr.h"
diff --git a/drivers/gpu/nvgpu/gk20a/tsg_gk20a.h b/drivers/gpu/nvgpu/include/nvgpu/tsg.h
similarity index 99%
rename from drivers/gpu/nvgpu/gk20a/tsg_gk20a.h
rename to drivers/gpu/nvgpu/include/nvgpu/tsg.h
index 1e3be5534..bed84986f 100644
--- a/drivers/gpu/nvgpu/gk20a/tsg_gk20a.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/tsg.h
@@ -26,7 +26,7 @@
 #include <nvgpu/kref.h>
 #include <nvgpu/rwsem.h>
 
-#include "gr_gk20a.h"
+#include "gk20a/gr_gk20a.h"
 
 #define NVGPU_INVALID_TSG_ID (-1)
 
diff --git a/drivers/gpu/nvgpu/os/linux/ioctl_dbg.c b/drivers/gpu/nvgpu/os/linux/ioctl_dbg.c
index 953b71682..705434be3 100644
--- a/drivers/gpu/nvgpu/os/linux/ioctl_dbg.c
+++ b/drivers/gpu/nvgpu/os/linux/ioctl_dbg.c
@@ -31,12 +31,12 @@
 #include <nvgpu/cond.h>
 #include <nvgpu/utils.h>
 #include <nvgpu/channel.h>
+#include <nvgpu/tsg.h>
 
 #include <nvgpu/linux/vm.h>
 
 #include "gk20a/gk20a.h"
 #include "gk20a/gr_gk20a.h"
-#include "gk20a/tsg_gk20a.h"
 #include "gk20a/regops_gk20a.h"
 #include "gk20a/dbg_gpu_gk20a.h"
 #include "os_linux.h"
diff --git a/drivers/gpu/nvgpu/os/linux/ioctl_tsg.c b/drivers/gpu/nvgpu/os/linux/ioctl_tsg.c
index 6dd96d6b8..998a1544b 100644
--- a/drivers/gpu/nvgpu/os/linux/ioctl_tsg.c
+++ b/drivers/gpu/nvgpu/os/linux/ioctl_tsg.c
@@ -26,9 +26,9 @@
 #include <nvgpu/log.h>
 #include <nvgpu/os_sched.h>
 #include <nvgpu/channel.h>
+#include <nvgpu/tsg.h>
 
 #include "gk20a/gk20a.h"
-#include "gk20a/tsg_gk20a.h"
 #include "gv11b/fifo_gv11b.h"
 #include "platform_gk20a.h"
 #include "ioctl_tsg.h"
diff --git a/drivers/gpu/nvgpu/os/linux/vgpu/vgpu_linux.c b/drivers/gpu/nvgpu/os/linux/vgpu/vgpu_linux.c
index f5628bc14..475c6dc05 100644
--- a/drivers/gpu/nvgpu/os/linux/vgpu/vgpu_linux.c
+++ b/drivers/gpu/nvgpu/os/linux/vgpu/vgpu_linux.c
@@ -36,7 +36,6 @@
 #include "vgpu_linux.h"
 #include "vgpu/fecs_trace_vgpu.h"
 #include "vgpu/clk_vgpu.h"
-#include "gk20a/tsg_gk20a.h"
 #include "gk20a/regops_gk20a.h"
 #include "gm20b/hal_gm20b.h"
 
diff --git a/drivers/gpu/nvgpu/os/posix/tsg.c b/drivers/gpu/nvgpu/os/posix/posix-tsg.c
similarity index 97%
rename from drivers/gpu/nvgpu/os/posix/tsg.c
rename to drivers/gpu/nvgpu/os/posix/posix-tsg.c
index 8736123d7..d8e3f370a 100644
--- a/drivers/gpu/nvgpu/os/posix/tsg.c
+++ b/drivers/gpu/nvgpu/os/posix/posix-tsg.c
@@ -20,7 +20,7 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-#include "gk20a/tsg_gk20a.h"
+#include <nvgpu/tsg.h>
 
 void gk20a_tsg_event_id_post_event(struct tsg_gk20a *tsg,
 				       int __event_id)
diff --git a/drivers/gpu/nvgpu/vgpu/gr_vgpu.c b/drivers/gpu/nvgpu/vgpu/gr_vgpu.c
index 4b1cf2122..9fafa52f7 100644
--- a/drivers/gpu/nvgpu/vgpu/gr_vgpu.c
+++ b/drivers/gpu/nvgpu/vgpu/gr_vgpu.c
@@ -30,11 +30,11 @@
 #include <nvgpu/vgpu/vgpu_ivc.h>
 #include <nvgpu/vgpu/vgpu.h>
 #include <nvgpu/channel.h>
+#include <nvgpu/tsg.h>
 
 #include "gr_vgpu.h"
 #include "gk20a/gk20a.h"
 #include "gk20a/dbg_gpu_gk20a.h"
-#include "gk20a/tsg_gk20a.h"
 #include "gk20a/fecs_trace_gk20a.h"
 
 #include <nvgpu/hw/gk20a/hw_gr_gk20a.h>
diff --git a/drivers/gpu/nvgpu/vgpu/tsg_vgpu.c b/drivers/gpu/nvgpu/vgpu/tsg_vgpu.c
index a81b50224..3553bf51d 100644
--- a/drivers/gpu/nvgpu/vgpu/tsg_vgpu.c
+++ b/drivers/gpu/nvgpu/vgpu/tsg_vgpu.c
@@ -21,11 +21,12 @@
  */
 
 #include "gk20a/gk20a.h"
-#include "gk20a/tsg_gk20a.h"
 #include "fifo_vgpu.h"
-#include <nvgpu/channel.h>
 
+#include <nvgpu/channel.h>
+#include <nvgpu/tsg.h>
 #include <nvgpu/bug.h>
+
 #include <nvgpu/vgpu/tegra_vgpu.h>
 #include <nvgpu/vgpu/vgpu.h>