diff --git a/drivers/gpu/nvgpu/Makefile b/drivers/gpu/nvgpu/Makefile
index 53de45b95..c51a0948e 100644
--- a/drivers/gpu/nvgpu/Makefile
+++ b/drivers/gpu/nvgpu/Makefile
@@ -4,6 +4,7 @@ ccflags-y += -I$(srctree.nvgpu)/drivers/gpu/nvgpu/include
 ccflags-y += -I$(srctree.nvgpu)/drivers/gpu/nvgpu
 ccflags-y += -I$(srctree.nvgpu)/include
 ccflags-y += -I$(srctree.nvgpu)/include/uapi
+ccflags-y += -I$(srctree.nvgpu-next)/drivers/gpu/nvgpu
 
 ccflags-y += -I$(srctree)/drivers/devfreq
 
diff --git a/drivers/gpu/nvgpu/gk20a/hal.c b/drivers/gpu/nvgpu/gk20a/hal.c
index ec6816c6c..939567e7f 100644
--- a/drivers/gpu/nvgpu/gk20a/hal.c
+++ b/drivers/gpu/nvgpu/gk20a/hal.c
@@ -29,6 +29,9 @@
 #include "gp106/hal_gp106.h"
 #include "gv100/hal_gv100.h"
 #include "gv11b/hal_gv11b.h"
+#if defined(CONFIG_TEGRA_GPU_NEXT)
+#include "nvgpu_gpuid_next.h"
+#endif
 
 #include <nvgpu/log.h>
 
@@ -59,6 +62,12 @@ int gpu_init_hal(struct gk20a *g)
 		if (gv100_init_hal(g))
 			return -ENODEV;
 		break;
+#if defined(CONFIG_TEGRA_GPU_NEXT)
+	case NVGPU_GPUID_NEXT:
+		if (NVGPU_NEXT_INIT_HAL(g))
+			return -ENODEV;
+		break;
+#endif
 
 	default:
 		nvgpu_err(g, "no support for %x", ver);