diff --git a/drivers/gpu/nvgpu/Makefile b/drivers/gpu/nvgpu/Makefile
index bd451650d..3ad6383a7 100644
--- a/drivers/gpu/nvgpu/Makefile
+++ b/drivers/gpu/nvgpu/Makefile
@@ -386,7 +386,7 @@ nvgpu-$(CONFIG_TEGRA_GR_VIRTUALIZATION) += \
 	common/vgpu/ltc_vgpu.o \
 	common/vgpu/gr_vgpu.o \
 	common/vgpu/fifo_vgpu.o \
-	common/vgpu/ce2_vgpu.o \
+	common/vgpu/ce_vgpu.o \
 	common/vgpu/mm_vgpu.o \
 	common/vgpu/vgpu.o \
 	common/vgpu/dbg_vgpu.o \
diff --git a/drivers/gpu/nvgpu/Makefile.sources b/drivers/gpu/nvgpu/Makefile.sources
index 123c3431b..e48717409 100644
--- a/drivers/gpu/nvgpu/Makefile.sources
+++ b/drivers/gpu/nvgpu/Makefile.sources
@@ -317,7 +317,7 @@ srcs += common/sim.c \
 	common/vgpu/clk_vgpu.c \
 	common/vgpu/dbg_vgpu.c \
 	common/vgpu/ltc_vgpu.c \
-	common/vgpu/ce2_vgpu.c \
+	common/vgpu/ce_vgpu.c \
 	common/vgpu/gv11b/vgpu_gv11b.c \
 	common/vgpu/gv11b/vgpu_hal_gv11b.c \
 	common/vgpu/gv11b/vgpu_fifo_gv11b.c \
diff --git a/drivers/gpu/nvgpu/common/vgpu/ce2_vgpu.c b/drivers/gpu/nvgpu/common/vgpu/ce_vgpu.c
similarity index 97%
rename from drivers/gpu/nvgpu/common/vgpu/ce2_vgpu.c
rename to drivers/gpu/nvgpu/common/vgpu/ce_vgpu.c
index f79ad908f..04bd8b5db 100644
--- a/drivers/gpu/nvgpu/common/vgpu/ce2_vgpu.c
+++ b/drivers/gpu/nvgpu/common/vgpu/ce_vgpu.c
@@ -26,6 +26,7 @@
 
 #include <nvgpu/bug.h>
 #include <nvgpu/vgpu/vgpu.h>
+#include <nvgpu/vgpu/ce_vgpu.h>
 
 u32 vgpu_ce_get_num_pce(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 f271b14ab..e1f887ad5 100644
--- a/drivers/gpu/nvgpu/common/vgpu/gp10b/vgpu_hal_gp10b.c
+++ b/drivers/gpu/nvgpu/common/vgpu/gp10b/vgpu_hal_gp10b.c
@@ -77,6 +77,8 @@
 #include <nvgpu/error_notifier.h>
 #include <nvgpu/channel.h>
 
+#include <nvgpu/vgpu/ce_vgpu.h>
+
 #include <nvgpu/hw/gp10b/hw_top_gp10b.h>
 #include <nvgpu/hw/gp10b/hw_pram_gp10b.h>
 #include <nvgpu/hw/gp10b/hw_pwr_gp10b.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 067ce6438..5534076ac 100644
--- a/drivers/gpu/nvgpu/common/vgpu/gv11b/vgpu_hal_gv11b.c
+++ b/drivers/gpu/nvgpu/common/vgpu/gv11b/vgpu_hal_gv11b.c
@@ -88,6 +88,8 @@
 #include <nvgpu/enabled.h>
 #include <nvgpu/channel.h>
 
+#include <nvgpu/vgpu/ce_vgpu.h>
+
 #include "vgpu_gv11b.h"
 #include "vgpu_gr_gv11b.h"
 #include "vgpu_fifo_gv11b.h"
diff --git a/drivers/gpu/nvgpu/include/nvgpu/vgpu/ce_vgpu.h b/drivers/gpu/nvgpu/include/nvgpu/vgpu/ce_vgpu.h
new file mode 100644
index 000000000..33d58d8cc
--- /dev/null
+++ b/drivers/gpu/nvgpu/include/nvgpu/vgpu/ce_vgpu.h
@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2019, NVIDIA CORPORATION.  All rights reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ */
+
+#ifndef CE_VGPU_H
+#define CE_VGPU_H
+
+struct gk20a;
+
+u32 vgpu_ce_get_num_pce(struct gk20a *g);
+
+#endif
diff --git a/drivers/gpu/nvgpu/include/nvgpu/vgpu/vgpu.h b/drivers/gpu/nvgpu/include/nvgpu/vgpu/vgpu.h
index 9a8efe625..f49d0d8c0 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/vgpu/vgpu.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/vgpu/vgpu.h
@@ -93,7 +93,7 @@ void vgpu_gr_handle_sm_esr_event(struct gk20a *g,
 			struct tegra_vgpu_sm_esr_info *info);
 int vgpu_gr_init_ctx_state(struct gk20a *g);
 int vgpu_fifo_isr(struct gk20a *g, struct tegra_vgpu_fifo_intr_info *info);
-u32 vgpu_ce_get_num_pce(struct gk20a *g);
+
 int vgpu_init_mm_support(struct gk20a *g);
 int vgpu_init_gr_support(struct gk20a *g);
 int vgpu_init_fifo_support(struct gk20a *g);