diff --git a/drivers/gpu/nvgpu/common/grmgr/grmgr.c b/drivers/gpu/nvgpu/common/grmgr/grmgr.c
index f92248b1b..f629ee7a8 100644
--- a/drivers/gpu/nvgpu/common/grmgr/grmgr.c
+++ b/drivers/gpu/nvgpu/common/grmgr/grmgr.c
@@ -38,7 +38,8 @@ int nvgpu_init_gr_manager(struct gk20a *g)
 	struct nvgpu_gr_syspipe *gr_syspipe = &gpu_instance->gr_syspipe;
 	u32 local_gpc_mask;
 	u32 ffs_bit = 0U;
-
+	u32 index;
+	const struct nvgpu_device *gr_dev = NULL;
 #ifdef CONFIG_NVGPU_NEXT
 	if (g->ops.grmgr.load_timestamp_prod != NULL) {
 		g->ops.grmgr.load_timestamp_prod(g);
@@ -64,7 +65,6 @@ int nvgpu_init_gr_manager(struct gk20a *g)
 	gr_syspipe->gr_dev = nvgpu_device_get(g, NVGPU_DEVTYPE_GRAPHICS, 0U);
 	nvgpu_assert(gr_syspipe->gr_dev != NULL);
 
-	g->mig.gpcgrp_gpc_count[0] = gr_syspipe->num_gpc;
 	if (g->ops.gr.config.get_gpc_mask != NULL) {
 		gr_syspipe->gpc_mask = g->ops.gr.config.get_gpc_mask(g);
 		nvgpu_assert(gr_syspipe->gpc_mask != 0U);
@@ -100,6 +100,36 @@ int nvgpu_init_gr_manager(struct gk20a *g)
 		nvgpu_assert(local_gpc_mask == 0U);
 	}
 
+	g->mig.usable_gr_syspipe_count =
+	nvgpu_device_count(g, NVGPU_DEVTYPE_GRAPHICS);
+	if ((g->mig.usable_gr_syspipe_count == 0U) ||
+			(g->mig.usable_gr_syspipe_count >=
+			 NVGPU_MIG_MAX_ENGINES)) {
+		nvgpu_err(g, "Usable GR engine syspipe"
+			"count[%u] is more than[%u]! or "
+			"No GR engine available on the device!",
+			g->mig.usable_gr_syspipe_count,
+			NVGPU_MIG_MAX_ENGINES);
+		nvgpu_assert(g->mig.usable_gr_syspipe_count <
+			NVGPU_MIG_MAX_ENGINES);
+		return -EINVAL;
+	}
+
+	index = 0U;
+	nvgpu_device_for_each(g, gr_dev, NVGPU_DEVTYPE_GRAPHICS) {
+		g->mig.usable_gr_syspipe_instance_id[index] =
+			gr_dev->inst_id;
+		g->mig.usable_gr_syspipe_mask |=
+			BIT32(gr_dev->inst_id);
+		index = nvgpu_safe_add_u32(index, 1U);
+	}
+
+	if (g->ops.grmgr.get_gpcgrp_count != NULL) {
+		g->ops.grmgr.get_gpcgrp_count(g);
+	} else {
+		g->mig.gpcgrp_gpc_count[0] = gr_syspipe->num_gpc;
+	}
+
 	if (g->ops.gr.init.get_max_subctx_count != NULL) {
 		gr_syspipe->max_veid_count_per_tsg =
 			g->ops.gr.init.get_max_subctx_count();
diff --git a/drivers/gpu/nvgpu/include/nvgpu/gops/grmgr.h b/drivers/gpu/nvgpu/include/nvgpu/gops/grmgr.h
index e42eef68a..aee73a8ca 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/gops/grmgr.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/gops/grmgr.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2020-2021, NVIDIA CORPORATION.  All rights reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -68,6 +68,14 @@ struct gops_grmgr {
 	 */
 	int (*remove_gr_manager)(struct gk20a *g);
 
+	/**
+	 * @brief Get gpc group information.
+	 *
+	 * @param g [in]		Pointer to GPU driver struct.
+	 *
+	 */
+	void (*get_gpcgrp_count)(struct gk20a *g);
+
 #if defined(CONFIG_NVGPU_NEXT) && defined(CONFIG_NVGPU_MIG)
 #include "include/nvgpu/nvgpu_next_gops_grmgr.h"
 #endif
diff --git a/drivers/gpu/nvgpu/os/linux/sysfs.c b/drivers/gpu/nvgpu/os/linux/sysfs.c
index 2ff63bd2e..e7a22b6e1 100644
--- a/drivers/gpu/nvgpu/os/linux/sysfs.c
+++ b/drivers/gpu/nvgpu/os/linux/sysfs.c
@@ -1097,7 +1097,11 @@ static ssize_t mig_mode_config_list_show(struct device *dev,
 			(g->ops.grmgr.get_mig_config_ptr != NULL) ?
 			g->ops.grmgr.get_mig_config_ptr(g) : NULL;
 		if (mig_gpu_instance_config == NULL) {
-			res += sprintf(&buf[res], "%s", error_on_nullconfig);
+			res += sprintf(&buf[res], "MIG is %s", nvgpu_is_enabled(g, NVGPU_SUPPORT_MIG) ?
+					"enabled\n" : "disabled\n");
+			res += scnprintf(&buf[res], (PAGE_SIZE - res - 1),"%s", error_on_nullconfig);
+			res += scnprintf(&buf[res], (PAGE_SIZE - res - 1), " for : %s\n",
+					g->name);
 			return res;
 		}
 	} else {
@@ -1106,7 +1110,12 @@ static ssize_t mig_mode_config_list_show(struct device *dev,
 	}
 
 	num_config = mig_gpu_instance_config->num_config_supported;
-	res += sprintf(&buf[res], "\n+++++++++ Config list Start ++++++++++\n");
+	if (!nvgpu_is_enabled(g, NVGPU_SUPPORT_MIG)) {
+		res += sprintf(&buf[res], "\n  MIG not enabled for %s \n", g->name);
+	}
+
+	res += scnprintf(&buf[res], (PAGE_SIZE - res - 1),
+		"\n+++++++++ Config list Start ++++++++++\n");
 	for (config_id = 0U; config_id < num_config; config_id++) {
 		res += scnprintf(&buf[res], (PAGE_SIZE - res - 1),
 			"\n CONFIG_ID : %d for CONFIG NAME : %s\n",