diff --git a/drivers/gpu/Makefile b/drivers/gpu/Makefile
index 80457d09..a148b91c 100644
--- a/drivers/gpu/Makefile
+++ b/drivers/gpu/Makefile
@@ -4,3 +4,4 @@
 obj-m += drm/tegra/
 obj-m += host1x/
 obj-m += host1x-nvhost/
+obj-m += nvgpu/
diff --git a/drivers/gpu/nvgpu/Makefile b/drivers/gpu/nvgpu/Makefile
new file mode 100644
index 00000000..1b8572eb
--- /dev/null
+++ b/drivers/gpu/nvgpu/Makefile
@@ -0,0 +1,10 @@
+# SPDX-License-Identifier: GPL-2.0
+# Copyright (c) 2022, NVIDIA CORPORATION.  All rights reserved.
+
+# NOTE: Do not change or add anything in this makefile.
+# The source code and makefile rules are copied from the
+# kernel/nvgpu/drivers/gpu/nvgpu. This file is
+# just place-holder for empty makefile to avoid any build
+# issue when copy is not done from command line and building
+# the tree independent of source copy.
+
diff --git a/kernel-src-files-copy-list.txt b/kernel-src-files-copy-list.txt
index 5cd3cc08..fd5f1300 100644
--- a/kernel-src-files-copy-list.txt
+++ b/kernel-src-files-copy-list.txt
@@ -33,3 +33,9 @@ copy_file nvidia/include/uapi/linux/nvhost_ioctl.h include/uapi/linux/nvhost_ioc
 
 # Files/directories for DRM
 copy_dir nvidia/drivers/gpu/drm/tegra drivers/gpu/drm/tegra
+
+# Files/directories for NVGPU
+copy_dir nvgpu/drivers/gpu/nvgpu drivers/gpu/nvgpu
+copy_dir nvgpu/include include
+copy_dir nvgpu/nvsched nvsched
+copy_file nvidia/drivers/video/tegra/nvmap/include/linux/nvmap_exports.h include/linux/nvmap_exports.h