diff --git a/drivers/gpu/nvgpu/Makefile b/drivers/gpu/nvgpu/Makefile
index 823a997eb..6a075ce44 100644
--- a/drivers/gpu/nvgpu/Makefile
+++ b/drivers/gpu/nvgpu/Makefile
@@ -34,7 +34,8 @@ nvgpu-y += common/bus/bus_gk20a.o \
 	common/fb/fb_gp10b.o \
 	common/fb/fb_gp106.o \
 	common/fb/fb_gv11b.o \
-	common/fb/fb_gv100.o
+	common/fb/fb_gv100.o \
+	common/xve/xve_gp106.o
 
 # Linux specific parts of nvgpu.
 nvgpu-y += \
@@ -327,9 +328,7 @@ nvgpu-y += \
 	clk/clk.o \
 	gp106/clk_gp106.o \
 	gp106/clk_arb_gp106.o \
-	gp106/xve_gp106.o \
 	gp106/therm_gp106.o \
-	gp106/xve_gp106.o \
 	pmgr/pwrdev.o \
 	pmgr/pmgr.o \
 	pmgr/pmgrpmu.o \
diff --git a/drivers/gpu/nvgpu/Makefile.sources b/drivers/gpu/nvgpu/Makefile.sources
index 6e951ae62..677b20bdf 100644
--- a/drivers/gpu/nvgpu/Makefile.sources
+++ b/drivers/gpu/nvgpu/Makefile.sources
@@ -42,6 +42,7 @@ srcs :=	common/mm/nvgpu_allocator.c \
 	common/fb/fb_gp106.c \
 	common/fb/fb_gv100.c \
 	common/fb/fb_gv11b.c \
+	common/xve/xve_gp106.c \
 	common/enabled.c \
 	common/pramin.c \
 	common/semaphore.c \
@@ -201,7 +202,6 @@ srcs :=	common/mm/nvgpu_allocator.c \
 	gp106/fuse_gp106.c \
 	gp106/clk_gp106.c \
 	gp106/clk_arb_gp106.c \
-	gp106/xve_gp106.c \
 	gp106/therm_gp106.c \
 	gv100/mm_gv100.c \
 	gv100/gr_ctx_gv100.c \
diff --git a/drivers/gpu/nvgpu/gp106/xve_gp106.c b/drivers/gpu/nvgpu/common/xve/xve_gp106.c
similarity index 99%
rename from drivers/gpu/nvgpu/gp106/xve_gp106.c
rename to drivers/gpu/nvgpu/common/xve/xve_gp106.c
index 40b0ff041..6cfbc9d99 100644
--- a/drivers/gpu/nvgpu/gp106/xve_gp106.c
+++ b/drivers/gpu/nvgpu/common/xve/xve_gp106.c
@@ -22,12 +22,13 @@
 
 #include "gk20a/gk20a.h"
 #include "gp106/bios_gp106.h"
-#include "gp106/xve_gp106.h"
 
 #include <nvgpu/bug.h>
 #include <nvgpu/xve.h>
 #include <nvgpu/io.h>
 
+#include "xve_gp106.h"
+
 #include <nvgpu/hw/gp106/hw_xp_gp106.h>
 #include <nvgpu/hw/gp106/hw_xve_gp106.h>
 
diff --git a/drivers/gpu/nvgpu/gp106/xve_gp106.h b/drivers/gpu/nvgpu/common/xve/xve_gp106.h
similarity index 100%
rename from drivers/gpu/nvgpu/gp106/xve_gp106.h
rename to drivers/gpu/nvgpu/common/xve/xve_gp106.h
diff --git a/drivers/gpu/nvgpu/gp106/hal_gp106.c b/drivers/gpu/nvgpu/gp106/hal_gp106.c
index 2cb433276..07846337c 100644
--- a/drivers/gpu/nvgpu/gp106/hal_gp106.c
+++ b/drivers/gpu/nvgpu/gp106/hal_gp106.c
@@ -31,6 +31,7 @@
 #include "common/fb/fb_gp10b.h"
 #include "common/fb/fb_gm20b.h"
 #include "common/fb/fb_gp106.h"
+#include "common/xve/xve_gp106.h"
 
 #include "gk20a/gk20a.h"
 #include "gk20a/fifo_gk20a.h"
@@ -76,7 +77,6 @@
 #include "gp106/mclk_gp106.h"
 #include "gp106/bios_gp106.h"
 #include "gp106/therm_gp106.h"
-#include "gp106/xve_gp106.h"
 #include "gp106/fifo_gp106.h"
 #include "gp106/clk_gp106.h"
 #include "gp106/mm_gp106.h"
diff --git a/drivers/gpu/nvgpu/gv100/hal_gv100.c b/drivers/gpu/nvgpu/gv100/hal_gv100.c
index b42c3432f..0f7fb3706 100644
--- a/drivers/gpu/nvgpu/gv100/hal_gv100.c
+++ b/drivers/gpu/nvgpu/gv100/hal_gv100.c
@@ -32,6 +32,7 @@
 #include "common/fb/fb_gp10b.h"
 #include "common/fb/fb_gv11b.h"
 #include "common/fb/fb_gv100.h"
+#include "common/xve/xve_gp106.h"
 
 #include "gk20a/gk20a.h"
 #include "gk20a/fifo_gk20a.h"
@@ -59,7 +60,6 @@
 #include "gp106/sec2_gp106.h"
 #include "gp106/bios_gp106.h"
 #include "gp106/therm_gp106.h"
-#include "gp106/xve_gp106.h"
 #include "gp106/clk_gp106.h"
 #include "gp106/flcn_gp106.h"