diff --git a/drivers/gpu/nvgpu/common/gr/gr.c b/drivers/gpu/nvgpu/common/gr/gr.c
index 47a51ad05..d624abd60 100644
--- a/drivers/gpu/nvgpu/common/gr/gr.c
+++ b/drivers/gpu/nvgpu/common/gr/gr.c
@@ -53,14 +53,6 @@
 
 #include "gr_priv.h"
 
-/*
- * Use this until common.gr is completely updated to support multiple
- * GR instances. Once that is supported, nvgpu_grmgr_get_num_gr_instances()
- * should be used to get number of GR instances.
- * Set this to 0 for local MIG testing.
- */
-#define NVGPU_GR_NUM_INSTANCES		1
-
 static int gr_alloc_global_ctx_buffers(struct gk20a *g, struct nvgpu_gr *gr)
 {
 	int err;
@@ -875,10 +867,7 @@ int nvgpu_gr_alloc(struct gk20a *g)
 		return 0;
 	}
 
-	g->num_gr_instances = NVGPU_GR_NUM_INSTANCES;
-	if (g->num_gr_instances == 0U) {
-		g->num_gr_instances = nvgpu_grmgr_get_num_gr_instances(g);
-	}
+	g->num_gr_instances = nvgpu_grmgr_get_num_gr_instances(g);
 	if (g->num_gr_instances == 0U) {
 		nvgpu_err(g, "No GR engine enumerated");
 		return -EINVAL;
diff --git a/userspace/units/acr/nvgpu-acr.c b/userspace/units/acr/nvgpu-acr.c
index fce6e3fa1..edeb8a6d9 100644
--- a/userspace/units/acr/nvgpu-acr.c
+++ b/userspace/units/acr/nvgpu-acr.c
@@ -180,6 +180,7 @@ static void nvgpu_init_gr_manager(struct gk20a *g)
 	struct nvgpu_gr_syspipe *gr_syspipe = &gpu_instance->gr_syspipe;
 
 	g->mig.num_gpu_instances = 1;
+	g->mig.num_gr_sys_pipes_enabled = 1;
 	gr_syspipe->gr_instance_id = 0U;
 	gr_syspipe->gr_syspipe_id = 0U;
 }
diff --git a/userspace/units/gr/nvgpu-gr.c b/userspace/units/gr/nvgpu-gr.c
index 77d2a8dd4..2f1de6383 100644
--- a/userspace/units/gr/nvgpu-gr.c
+++ b/userspace/units/gr/nvgpu-gr.c
@@ -47,6 +47,7 @@ static void nvgpu_init_gr_manager(struct gk20a *g)
 	struct nvgpu_gr_syspipe *gr_syspipe = &gpu_instance->gr_syspipe;
 
 	g->mig.num_gpu_instances = 1;
+	g->mig.num_gr_sys_pipes_enabled = 1;
 	gr_syspipe->gr_instance_id = 0U;
 	gr_syspipe->gr_syspipe_id = 0U;
 }
diff --git a/userspace/units/ltc/nvgpu-ltc.c b/userspace/units/ltc/nvgpu-ltc.c
index 52d48e85c..b5dc04090 100644
--- a/userspace/units/ltc/nvgpu-ltc.c
+++ b/userspace/units/ltc/nvgpu-ltc.c
@@ -248,6 +248,7 @@ static void nvgpu_init_gr_manager(struct gk20a *g)
 	struct nvgpu_gr_syspipe *gr_syspipe = &gpu_instance->gr_syspipe;
 
 	g->mig.num_gpu_instances = 1;
+	g->mig.num_gr_sys_pipes_enabled = 1;
 	gr_syspipe->gr_instance_id = 0U;
 	gr_syspipe->gr_syspipe_id = 0U;
 }
diff --git a/userspace/units/pmu/nvgpu-pmu.c b/userspace/units/pmu/nvgpu-pmu.c
index ce2456cdd..f99c81d10 100644
--- a/userspace/units/pmu/nvgpu-pmu.c
+++ b/userspace/units/pmu/nvgpu-pmu.c
@@ -168,6 +168,7 @@ static void nvgpu_init_gr_manager(struct gk20a *g)
 	struct nvgpu_gr_syspipe *gr_syspipe = &gpu_instance->gr_syspipe;
 
 	g->mig.num_gpu_instances = 1;
+	g->mig.num_gr_sys_pipes_enabled = 1;
 	gr_syspipe->gr_instance_id = 0U;
 	gr_syspipe->gr_syspipe_id = 0U;
 }