diff --git a/drivers/gpu/nvgpu/common/nvs/nvs_sched_ctrl.c b/drivers/gpu/nvgpu/common/nvs/nvs_sched_ctrl.c
index 575b3e49f..5459ae54d 100644
--- a/drivers/gpu/nvgpu/common/nvs/nvs_sched_ctrl.c
+++ b/drivers/gpu/nvgpu/common/nvs/nvs_sched_ctrl.c
@@ -502,7 +502,11 @@ int nvgpu_nvs_buffer_alloc(struct nvgpu_nvs_domain_ctrl_fifo *sched_ctrl,
 	}
 
 	g = sched_ctrl->g;
-	system_vm = g->mm.pmu.vm;
+	if (nvgpu_is_enabled(g, (u32)(NVGPU_SUPPORT_GSP_VM))) {
+		system_vm = g->mm.gsp.vm;
+	} else {
+		system_vm = g->mm.pmu.vm;
+	}
 
 	(void)memset(buf, 0, sizeof(*buf));
 	buf->g = g;