diff --git a/drivers/Makefile b/drivers/Makefile
index b3ed00a8..e5552015 100644
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -3,6 +3,7 @@
 
 LINUXINCLUDE += -I$(srctree.nvidia-oot)/include
 
+obj-m += gpu/
 obj-m += hwmon/
 obj-m += i2c/busses/
 obj-m += mfd/
diff --git a/drivers/gpu/Makefile b/drivers/gpu/Makefile
new file mode 100644
index 00000000..6416de75
--- /dev/null
+++ b/drivers/gpu/Makefile
@@ -0,0 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
+# Copyright (c) 2022, NVIDIA CORPORATION.  All rights reserved.
+
+obj-m += host1x/
diff --git a/drivers/gpu/host1x/Makefile b/drivers/gpu/host1x/Makefile
new file mode 100644
index 00000000..890ed2b0
--- /dev/null
+++ b/drivers/gpu/host1x/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/nvidia/drivers/gpu/host1x. 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 83ae7b3d..dfd01c2e 100644
--- a/kernel-src-files-copy-list.txt
+++ b/kernel-src-files-copy-list.txt
@@ -15,3 +15,6 @@ copy_file nvidia/include/uapi/linux/nvmap.h include/uapi/linux/nvmap.h
 copy_dir nvidia/drivers/platform/tegra/cvnas drivers/platform/tegra/cvnas
 copy_file nvidia/include/linux/cvnas.h include/linux/cvnas.h
 copy_file nvidia/include/soc/tegra/fuse-helper.h include/soc/tegra/fuse-helper.h
+
+# Files/directories for host1x module
+copy_dir nvidia/drivers/gpu/host1x drivers/gpu/host1x