diff --git a/arch/nvgpu.yaml b/arch/nvgpu.yaml
index 6fd27e89f..b82d76812 100644
--- a/arch/nvgpu.yaml
+++ b/arch/nvgpu.yaml
@@ -1,4 +1,4 @@
-# Copyright (c) 2019-2020, NVIDIA CORPORATION.  All Rights Reserved.
+# Copyright (c) 2019-2021, NVIDIA CORPORATION.  All Rights Reserved.
 #
 # Top level NVGPU architecure description in YAML.
 #
@@ -67,3 +67,8 @@ nvgpu:
       safe: no
       children:
         !include nvgpu-gpu_hw.yaml
+
+    nvgpu_next:
+      safe: no
+      children:
+        !include nvgpu-next.yaml
diff --git a/drivers/gpu/nvgpu/common/acr/acr.c b/drivers/gpu/nvgpu/common/acr/acr.c
index f269e14bd..5a91d69e9 100644
--- a/drivers/gpu/nvgpu/common/acr/acr.c
+++ b/drivers/gpu/nvgpu/common/acr/acr.c
@@ -42,6 +42,10 @@
 #endif
 #endif
 
+#if defined(CONFIG_NVGPU_NON_FUSA) && defined(CONFIG_NVGPU_NEXT)
+#include <nvgpu_next_acr.h>
+#endif
+
 /* ACR public API's */
 bool nvgpu_acr_is_lsf_lazy_bootstrap(struct gk20a *g, struct nvgpu_acr *acr,
 	u32 falcon_id)
@@ -163,9 +167,14 @@ int nvgpu_acr_init(struct gk20a *g)
 #endif /* CONFIG_NVGPU_NON_FUSA */
 #endif
 	default:
-		nvgpu_kfree(g, g->acr);
-		err = -EINVAL;
-		nvgpu_err(g, "no support for GPUID %x", ver);
+#if defined(CONFIG_NVGPU_NON_FUSA) && defined(CONFIG_NVGPU_NEXT)
+		if (nvgpu_next_acr_init(g))
+#endif
+		{
+			nvgpu_kfree(g, g->acr);
+			err = -ENODEV;
+			nvgpu_err(g, "no support for GPUID %x", ver);
+		}
 		break;
 	}
 
diff --git a/drivers/gpu/nvgpu/common/acr/acr_blob_construct.c b/drivers/gpu/nvgpu/common/acr/acr_blob_construct.c
index 2766c80a9..80e35d4ad 100644
--- a/drivers/gpu/nvgpu/common/acr/acr_blob_construct.c
+++ b/drivers/gpu/nvgpu/common/acr/acr_blob_construct.c
@@ -33,6 +33,10 @@
 #include "acr_wpr.h"
 #include "acr_priv.h"
 
+#if defined(CONFIG_NVGPU_NON_FUSA) && defined(CONFIG_NVGPU_NEXT)
+#include <nvgpu_next_firmware.h>
+#endif
+
 #define APP_IMEM_OFFSET			(0)
 #define APP_IMEM_ENTRY			(0)
 #define APP_DMEM_OFFSET			(0)
@@ -210,7 +214,9 @@ int nvgpu_acr_lsf_fecs_ucode_details(struct gk20a *g, void *lsf_ucode_img)
 #endif
 
 		default:
-			nvgpu_err(g, "no support for GPUID %x", ver);
+#if defined(CONFIG_NVGPU_NON_FUSA) && defined(CONFIG_NVGPU_NEXT)
+			fecs_sig = nvgpu_next_request_fecs_firmware(g);
+#endif
 			break;
 	}
 
@@ -361,7 +367,9 @@ int nvgpu_acr_lsf_gpccs_ucode_details(struct gk20a *g, void *lsf_ucode_img)
 #endif
 
 		default:
-			nvgpu_err(g, "no support for GPUID %x", ver);
+#if defined(CONFIG_NVGPU_NON_FUSA) && defined(CONFIG_NVGPU_NEXT)
+			gpccs_sig = nvgpu_next_request_gpccs_firmware(g);
+#endif
 			break;
 	}
 
diff --git a/drivers/gpu/nvgpu/common/falcon/falcon.c b/drivers/gpu/nvgpu/common/falcon/falcon.c
index e6c16ee99..0fa55df94 100644
--- a/drivers/gpu/nvgpu/common/falcon/falcon.c
+++ b/drivers/gpu/nvgpu/common/falcon/falcon.c
@@ -34,6 +34,10 @@
 #include "falcon_sw_ga10b.h"
 #endif /* CONFIG_NVGPU_NON_FUSA */
 
+#if defined(CONFIG_NVGPU_NON_FUSA) && defined(CONFIG_NVGPU_NEXT)
+#include <nvgpu_next_falcon.h>
+#endif
+
 static bool is_falcon_valid(struct nvgpu_falcon *flcn)
 {
 	if (flcn == NULL) {
@@ -476,8 +480,14 @@ static int falcon_sw_chip_init(struct gk20a *g, struct nvgpu_falcon *flcn)
 		gk20a_falcon_sw_init(flcn);
 		break;
 	default:
-		err = -EINVAL;
-		nvgpu_err(g, "no support for GPUID %x", ver);
+#if defined(CONFIG_NVGPU_NON_FUSA) && defined(CONFIG_NVGPU_NEXT)
+		err = nvgpu_next_falcon_sw_init(g, flcn);
+		if (err != 0)
+#endif
+		{
+			err = -ENODEV;
+			nvgpu_err(g, "no support for GPUID %x", ver);
+		}
 		break;
 	}
 
diff --git a/drivers/gpu/nvgpu/common/pmu/lsfm/lsfm.c b/drivers/gpu/nvgpu/common/pmu/lsfm/lsfm.c
index b38a80794..c870caf66 100644
--- a/drivers/gpu/nvgpu/common/pmu/lsfm/lsfm.c
+++ b/drivers/gpu/nvgpu/common/pmu/lsfm/lsfm.c
@@ -34,6 +34,10 @@
 #include "lsfm_sw_tu104.h"
 #endif
 
+#if defined(CONFIG_NVGPU_NON_FUSA) && defined(CONFIG_NVGPU_NEXT)
+#include <nvgpu_next_lsfm.h>
+#endif
+
 static bool is_lsfm_supported(struct gk20a *g,
 	struct nvgpu_pmu *pmu, struct nvgpu_pmu_lsfm *lsfm)
 {
@@ -170,9 +174,14 @@ int nvgpu_pmu_lsfm_init(struct gk20a *g, struct nvgpu_pmu_lsfm **lsfm)
 		break;
 #endif
 	default:
-		nvgpu_kfree(g, *lsfm);
-		err = -EINVAL;
-		nvgpu_err(g, "no support for GPUID %x", ver);
+#if defined(CONFIG_NVGPU_NON_FUSA) && defined(CONFIG_NVGPU_NEXT)
+		if (nvgpu_next_lsfm_sw_init(g, lsfm))
+#endif
+		{
+			nvgpu_kfree(g, *lsfm);
+			err = -ENODEV;
+			nvgpu_err(g, "no support for GPUID %x", ver);
+		}
 		break;
 	}
 
diff --git a/drivers/gpu/nvgpu/common/pmu/perfmon/pmu_perfmon.c b/drivers/gpu/nvgpu/common/pmu/perfmon/pmu_perfmon.c
index 067efecbc..b2714a213 100644
--- a/drivers/gpu/nvgpu/common/pmu/perfmon/pmu_perfmon.c
+++ b/drivers/gpu/nvgpu/common/pmu/perfmon/pmu_perfmon.c
@@ -40,6 +40,10 @@
 #include "pmu_perfmon_sw_ga10b.h"
 #endif
 
+#if defined(CONFIG_NVGPU_NON_FUSA) && defined(CONFIG_NVGPU_NEXT)
+#include <nvgpu_next_perfmon.h>
+#endif
+
 static u8 get_perfmon_id(struct nvgpu_pmu *pmu)
 {
 	struct gk20a *g = pmu->g;
@@ -60,10 +64,17 @@ static u8 get_perfmon_id(struct nvgpu_pmu *pmu)
 		unit_id = PMU_UNIT_PERFMON_T18X;
 		break;
 	default:
+#if defined(CONFIG_NVGPU_NON_FUSA) && defined(CONFIG_NVGPU_NEXT)
+		unit_id = nvgpu_next_get_perfmon_id(pmu);
+#else
 		unit_id = PMU_UNIT_INVALID;
+#endif
+		break;
+	}
+
+	if (unit_id == PMU_UNIT_INVALID) {
 		nvgpu_err(g, "no support for %x", ver);
 		WARN_ON(true);
-		break;
 	}
 
 	return unit_id;
@@ -149,9 +160,14 @@ int nvgpu_pmu_initialize_perfmon(struct gk20a *g, struct nvgpu_pmu *pmu,
 		break;
 #endif
 	default:
-		nvgpu_kfree(g, *perfmon_ptr);
-		err = -EINVAL;
-		nvgpu_err(g, "no support for GPUID %x", ver);
+#if defined(CONFIG_NVGPU_NON_FUSA) && defined(CONFIG_NVGPU_NEXT)
+		if (nvgpu_next_pmu_initialize_perfmon(g, pmu, perfmon_ptr))
+#endif
+		{
+			nvgpu_kfree(g, *perfmon_ptr);
+			err = -ENODEV;
+			nvgpu_err(g, "no support for GPUID %x", ver);
+		}
 		break;
 	}
 
diff --git a/drivers/gpu/nvgpu/common/pmu/pg/pmu_pg.c b/drivers/gpu/nvgpu/common/pmu/pg/pmu_pg.c
index 64e141cd1..b779c65fb 100644
--- a/drivers/gpu/nvgpu/common/pmu/pg/pmu_pg.c
+++ b/drivers/gpu/nvgpu/common/pmu/pg/pmu_pg.c
@@ -43,6 +43,10 @@
 #endif /* CONFIG_NVGPU_NON_FUSA */
 #include "pmu_pg.h"
 
+#if defined(CONFIG_NVGPU_NON_FUSA) && defined(CONFIG_NVGPU_NEXT)
+#include <nvgpu_next_pmu_pg.h>
+#endif
+
 static bool is_pg_supported(struct gk20a *g, struct nvgpu_pmu_pg *pg)
 {
 	if (!g->support_ls_pmu || !g->can_elpg || pg == NULL) {
@@ -888,9 +892,14 @@ int nvgpu_pmu_pg_init(struct gk20a *g, struct nvgpu_pmu *pmu,
 #endif /* CONFIG_NVGPU_NON_FUSA */
 
 	default:
-		nvgpu_kfree(g, *pg_p);
-		err = -EINVAL;
-		nvgpu_err(g, "no support for GPUID %x", ver);
+#if defined(CONFIG_NVGPU_NON_FUSA) && defined(CONFIG_NVGPU_NEXT)
+		if (nvgpu_next_pg_sw_init(g, pg_p))
+#endif
+		{
+			nvgpu_kfree(g, *pg_p);
+			err = -ENODEV;
+			nvgpu_err(g, "no support for GPUID %x", ver);
+		}
 		break;
 	}
 exit:
diff --git a/drivers/gpu/nvgpu/hal/init/hal_init.c b/drivers/gpu/nvgpu/hal/init/hal_init.c
index 042e8333f..00eff52a2 100644
--- a/drivers/gpu/nvgpu/hal/init/hal_init.c
+++ b/drivers/gpu/nvgpu/hal/init/hal_init.c
@@ -43,6 +43,10 @@
 #endif
 #endif
 
+#if defined(CONFIG_NVGPU_NON_FUSA) && defined(CONFIG_NVGPU_NEXT)
+#include <nvgpu_next_hal_init.h>
+#endif
+
 #include "hal/mc/mc_gm20b.h"
 
 int nvgpu_init_hal(struct gk20a *g)
@@ -55,51 +59,56 @@ int nvgpu_init_hal(struct gk20a *g)
 	case GK20A_GPUID_GM20B:
 		nvgpu_log_info(g, "gm20b detected");
 		if (gm20b_init_hal(g) != 0) {
-			return -ENODEV;
+			err = -ENODEV;
 		}
 		break;
 	case GK20A_GPUID_GM20B_B:
 		nvgpu_log_info(g, "gm20b detected");
 		if (gm20b_init_hal(g) != 0) {
-			return -ENODEV;
+			err = -ENODEV;
 		}
 		break;
 	case NVGPU_GPUID_GP10B:
 		if (gp10b_init_hal(g) != 0) {
-			return -ENODEV;
+			err = -ENODEV;
 		}
 		break;
 	case NVGPU_GPUID_GA10B:
 		if (ga10b_init_hal(g) != 0) {
-			return -ENODEV;
+			err = -ENODEV;
 		}
 		break;
 #endif
 
 	case NVGPU_GPUID_GV11B:
 		if (gv11b_init_hal(g) != 0) {
-			return -ENODEV;
+			err = -ENODEV;
 		}
 		break;
 
 #if defined(CONFIG_NVGPU_DGPU) && defined(CONFIG_NVGPU_HAL_NON_FUSA)
 	case NVGPU_GPUID_TU104:
 		if (tu104_init_hal(g) != 0) {
-			return -ENODEV;
+			err = -ENODEV;
 		}
 		break;
 #if defined(CONFIG_NVGPU_HAL_NON_FUSA) && defined(CONFIG_NVGPU_DGPU)
 	case NVGPU_GPUID_GA100:
 		if (ga100_init_hal(g) != 0) {
-			return -ENODEV;
+			err = -ENODEV;
 		}
 		break;
 #endif
 
 #endif
 	default:
-		nvgpu_err(g, "no support for %x", ver);
-		err = -ENODEV;
+#if defined(CONFIG_NVGPU_HAL_NON_FUSA) && defined(CONFIG_NVGPU_NEXT)
+		if (nvgpu_next_init_hal(g) != 0)
+#endif /* CONFIG_NVGPU_NEXT */
+		{
+			nvgpu_err(g, "no support for %x", ver);
+			err = -ENODEV;
+		}
 		break;
 	}
 
diff --git a/drivers/gpu/nvgpu/os/linux/module.c b/drivers/gpu/nvgpu/os/linux/module.c
index 7b5d7d56f..50e107b4b 100644
--- a/drivers/gpu/nvgpu/os/linux/module.c
+++ b/drivers/gpu/nvgpu/os/linux/module.c
@@ -94,6 +94,10 @@
 #include "cde.h"
 #endif
 
+#if defined(CONFIG_NVGPU_HAL_NON_FUSA) && defined(CONFIG_NVGPU_NEXT)
+#include <nvgpu_next_chips.h>
+#endif
+
 #define GK20A_WAIT_FOR_IDLE_MS	2000
 
 #define CREATE_TRACE_POINTS
@@ -691,6 +695,12 @@ static struct of_device_id tegra_gk20a_of_match[] = {
 		.data = &ga10b_vgpu_tegra_platform},
 #endif
 #endif
+#endif
+
+#ifdef CONFIG_NVGPU_NEXT
+#if defined(CONFIG_NVGPU_HAL_NON_FUSA) && defined(CONFIG_NVGPU_NON_FUSA)
+	NVGPU_NEXT_COMPATIBLE_CHIPS
+#endif
 #endif
 	{ },
 };
diff --git a/drivers/gpu/nvgpu/os/linux/platform_gk20a.h b/drivers/gpu/nvgpu/os/linux/platform_gk20a.h
index 0d5a188c7..b459f5a6a 100644
--- a/drivers/gpu/nvgpu/os/linux/platform_gk20a.h
+++ b/drivers/gpu/nvgpu/os/linux/platform_gk20a.h
@@ -21,6 +21,10 @@
 #include <nvgpu/lock.h>
 #include <nvgpu/gk20a.h>
 
+#if defined(CONFIG_NVGPU_NEXT)
+#include <nvgpu_next_chips.h>
+#endif
+
 #define GK20A_CLKS_MAX		4
 
 struct gk20a;
@@ -62,6 +66,9 @@ enum tegra_chip_id {
 	TEGRA_194,
 	TEGRA_194_VGPU,
 	TEGRA_234,
+#ifdef CONFIG_NVGPU_NEXT
+	NVGPU_NEXT_TEGRA_CHIPS
+#endif
 };
 
 struct gk20a_platform {
diff --git a/userspace/units/acr/nvgpu-acr.c b/userspace/units/acr/nvgpu-acr.c
index 245a132ea..ab871c360 100644
--- a/userspace/units/acr/nvgpu-acr.c
+++ b/userspace/units/acr/nvgpu-acr.c
@@ -944,7 +944,7 @@ int test_acr_init(struct unit_module *m,
 	g->params.gpu_impl = NV_PMC_BOOT_0_IMPLEMENTATION_INVALID;
 
 	err = nvgpu_acr_init(g);
-	if (err != -EINVAL) {
+	if (err != -ENODEV) {
 		unit_return_fail(m, "Version failure of chip for \
 				nvgpu_acr_init() didn't happen as expected\n");
 	}