diff --git a/drivers/gpu/nvgpu/Makefile b/drivers/gpu/nvgpu/Makefile
index 3ad6383a7..f94d329ea 100644
--- a/drivers/gpu/nvgpu/Makefile
+++ b/drivers/gpu/nvgpu/Makefile
@@ -391,7 +391,7 @@ nvgpu-$(CONFIG_TEGRA_GR_VIRTUALIZATION) += \
 	common/vgpu/vgpu.o \
 	common/vgpu/dbg_vgpu.o \
 	common/vgpu/tsg_vgpu.o \
-	common/vgpu/css_vgpu.o \
+	common/vgpu/perf/cyclestats_snapshot_vgpu.o \
 	common/vgpu/ecc_vgpu.o \
 	common/vgpu/clk_vgpu.o \
 	common/vgpu/fecs_trace_vgpu.o \
diff --git a/drivers/gpu/nvgpu/Makefile.sources b/drivers/gpu/nvgpu/Makefile.sources
index e48717409..3893ef0dc 100644
--- a/drivers/gpu/nvgpu/Makefile.sources
+++ b/drivers/gpu/nvgpu/Makefile.sources
@@ -310,7 +310,7 @@ srcs += common/sim.c \
 	common/vgpu/vgpu.c \
 	common/vgpu/fifo_vgpu.c	\
 	common/vgpu/tsg_vgpu.c \
-	common/vgpu/css_vgpu.c \
+	common/vgpu/perf/cyclestats_snapshot_vgpu.c \
 	common/vgpu/fecs_trace_vgpu.c \
 	common/vgpu/mm_vgpu.c \
 	common/vgpu/gr_vgpu.c \
diff --git a/drivers/gpu/nvgpu/common/vgpu/gm20b/vgpu_gr_gm20b.c b/drivers/gpu/nvgpu/common/vgpu/gm20b/vgpu_gr_gm20b.c
index ef19f2d99..d22854055 100644
--- a/drivers/gpu/nvgpu/common/vgpu/gm20b/vgpu_gr_gm20b.c
+++ b/drivers/gpu/nvgpu/common/vgpu/gm20b/vgpu_gr_gm20b.c
@@ -24,7 +24,7 @@
 #include <nvgpu/enabled.h>
 #include <nvgpu/cyclestats_snapshot.h>
 
-#include "common/vgpu/css_vgpu.h"
+#include "common/vgpu/perf/cyclestats_snapshot_vgpu.h"
 #include "vgpu_gr_gm20b.h"
 
 void vgpu_gr_gm20b_init_cyclestats(struct gk20a *g)
diff --git a/drivers/gpu/nvgpu/common/vgpu/gp10b/vgpu_hal_gp10b.c b/drivers/gpu/nvgpu/common/vgpu/gp10b/vgpu_hal_gp10b.c
index e1f887ad5..9c30e2cd1 100644
--- a/drivers/gpu/nvgpu/common/vgpu/gp10b/vgpu_hal_gp10b.c
+++ b/drivers/gpu/nvgpu/common/vgpu/gp10b/vgpu_hal_gp10b.c
@@ -47,7 +47,7 @@
 #include "common/vgpu/mm_vgpu.h"
 #include "common/vgpu/dbg_vgpu.h"
 #include "common/vgpu/fecs_trace_vgpu.h"
-#include "common/vgpu/css_vgpu.h"
+#include "common/vgpu/perf/cyclestats_snapshot_vgpu.h"
 #include "gp10b/gp10b.h"
 #include "gp10b/hal_gp10b.h"
 #include "common/vgpu/gm20b/vgpu_gr_gm20b.h"
diff --git a/drivers/gpu/nvgpu/common/vgpu/gv11b/vgpu_hal_gv11b.c b/drivers/gpu/nvgpu/common/vgpu/gv11b/vgpu_hal_gv11b.c
index 5534076ac..2536ff7dd 100644
--- a/drivers/gpu/nvgpu/common/vgpu/gv11b/vgpu_hal_gv11b.c
+++ b/drivers/gpu/nvgpu/common/vgpu/gv11b/vgpu_hal_gv11b.c
@@ -58,7 +58,7 @@
 #include "common/vgpu/mm_vgpu.h"
 #include "common/vgpu/dbg_vgpu.h"
 #include "common/vgpu/fecs_trace_vgpu.h"
-#include "common/vgpu/css_vgpu.h"
+#include "common/vgpu/perf/cyclestats_snapshot_vgpu.h"
 #include "common/vgpu/gm20b/vgpu_gr_gm20b.h"
 #include "common/vgpu/gp10b/vgpu_mm_gp10b.h"
 #include "common/vgpu/gp10b/vgpu_gr_gp10b.h"
diff --git a/drivers/gpu/nvgpu/common/vgpu/css_vgpu.c b/drivers/gpu/nvgpu/common/vgpu/perf/cyclestats_snapshot_vgpu.c
similarity index 99%
rename from drivers/gpu/nvgpu/common/vgpu/css_vgpu.c
rename to drivers/gpu/nvgpu/common/vgpu/perf/cyclestats_snapshot_vgpu.c
index 8412f9c47..03e27735a 100644
--- a/drivers/gpu/nvgpu/common/vgpu/css_vgpu.c
+++ b/drivers/gpu/nvgpu/common/vgpu/perf/cyclestats_snapshot_vgpu.c
@@ -30,7 +30,7 @@
 #include <nvgpu/channel.h>
 #include <nvgpu/cyclestats_snapshot.h>
 
-#include "common/vgpu/css_vgpu.h"
+#include "cyclestats_snapshot_vgpu.h"
 
 static struct tegra_hv_ivm_cookie *css_cookie;
 
diff --git a/drivers/gpu/nvgpu/common/vgpu/css_vgpu.h b/drivers/gpu/nvgpu/common/vgpu/perf/cyclestats_snapshot_vgpu.h
similarity index 100%
rename from drivers/gpu/nvgpu/common/vgpu/css_vgpu.h
rename to drivers/gpu/nvgpu/common/vgpu/perf/cyclestats_snapshot_vgpu.h