diff --git a/drivers/gpu/nvgpu/os/linux/debug.c b/drivers/gpu/nvgpu/os/linux/debug.c
index d39426960..ccd6811c0 100644
--- a/drivers/gpu/nvgpu/os/linux/debug.c
+++ b/drivers/gpu/nvgpu/os/linux/debug.c
@@ -15,7 +15,6 @@
  */
 
 #include "debug_cde.h"
-#include "debug_ce.h"
 #include "debug_fifo.h"
 #include "debug_gr.h"
 #include "debug_allocator.h"
@@ -520,8 +519,6 @@ void gk20a_debug_init(struct gk20a *g, const char *debugfs_symlink)
 #endif
 	nvgpu_ltc_debugfs_init(g);
 #ifdef CONFIG_NVGPU_DGPU
-	if (!g->is_virtual)
-		nvgpu_ce_debugfs_init(g);
 	if (g->pci_vendor_id) {
 		nvgpu_xve_debugfs_init(g);
 		nvgpu_bios_debugfs_init(g);
diff --git a/drivers/gpu/nvgpu/os/linux/module.c b/drivers/gpu/nvgpu/os/linux/module.c
index 813ad86e5..9372bcb79 100644
--- a/drivers/gpu/nvgpu/os/linux/module.c
+++ b/drivers/gpu/nvgpu/os/linux/module.c
@@ -82,6 +82,7 @@
 #include "fecs_trace_linux.h"
 #include "driver_common.h"
 #include "channel.h"
+#include "debug_ce.h"
 #include "debug_pmgr.h"
 #include "dmabuf_priv.h"
 
@@ -307,6 +308,11 @@ int nvgpu_finalize_poweron_linux(struct nvgpu_os_linux *l)
 		return err;
 	}
 
+#ifdef CONFIG_NVGPU_DGPU
+	if (!g->is_virtual)
+		nvgpu_ce_debugfs_init(g);
+#endif
+
 	l->init_done = true;
 
 	return 0;