diff --git a/arch/nvgpu-common.yaml b/arch/nvgpu-common.yaml
index 7a65f204a..165248a5b 100644
--- a/arch/nvgpu-common.yaml
+++ b/arch/nvgpu-common.yaml
@@ -337,6 +337,7 @@ gsp_sched:
              common/gsp_scheduler/ipc/gsp_msg.h,
              common/gsp_scheduler/gsp_scheduler.c,
              common/gsp_scheduler/gsp_scheduler.h,
+             common/gsp_scheduler/gsp_nvs.c,
              common/gsp_scheduler/gsp_runlist.c,
              common/gsp_scheduler/gsp_runlist.h,
              common/gsp_scheduler/gsp_ctrl_fifo.c,
diff --git a/drivers/gpu/nvgpu/Makefile b/drivers/gpu/nvgpu/Makefile
index 57d6da032..b77db1c75 100644
--- a/drivers/gpu/nvgpu/Makefile
+++ b/drivers/gpu/nvgpu/Makefile
@@ -444,7 +444,8 @@ nvgpu-$(CONFIG_NVGPU_GSP_SCHEDULER) += \
 	common/gsp_scheduler/ipc/gsp_msg.o \
 	common/gsp_scheduler/gsp_scheduler.o \
 	common/gsp_scheduler/gsp_runlist.o \
-	common/gsp_scheduler/gsp_ctrl_fifo.o
+	common/gsp_scheduler/gsp_ctrl_fifo.o \
+	common/gsp_scheduler/gsp_nvs.o
 endif
 
 ifeq ($(CONFIG_NVGPU_GSP_STRESS_TEST),y)
diff --git a/drivers/gpu/nvgpu/Makefile.sources b/drivers/gpu/nvgpu/Makefile.sources
index 80e6b9824..eb7a8ce40 100644
--- a/drivers/gpu/nvgpu/Makefile.sources
+++ b/drivers/gpu/nvgpu/Makefile.sources
@@ -203,7 +203,8 @@ srcs += common/gsp/gsp_init.c \
 	common/gsp_scheduler/ipc/gsp_msg.c \
 	common/gsp_scheduler/gsp_scheduler.c \
 	common/gsp_scheduler/gsp_runlist.c \
-	common/gsp_scheduler/gsp_ctrl_fifo.c
+	common/gsp_scheduler/gsp_ctrl_fifo.c \
+	common/gsp_scheduler/gsp_nvs.c
 endif
 
 ifeq ($(CONFIG_NVGPU_GSP_STRESS_TEST),1)
diff --git a/drivers/gpu/nvgpu/common/fifo/runlist.c b/drivers/gpu/nvgpu/common/fifo/runlist.c
index bd8bd52e0..3abfbff5a 100644
--- a/drivers/gpu/nvgpu/common/fifo/runlist.c
+++ b/drivers/gpu/nvgpu/common/fifo/runlist.c
@@ -39,7 +39,12 @@
 #include <nvgpu/pmu/mutex.h>
 #endif
 #include <nvgpu/nvgpu_init.h>
-
+#ifdef CONFIG_NVGPU_GSP_SCHEDULER
+#include <nvgpu/gsp_sched.h>
+#endif
+#ifdef CONFIG_NVS_PRESENT
+#include <nvgpu/nvs.h>
+#endif
 void nvgpu_runlist_lock_active_runlists(struct gk20a *g)
 {
 	struct nvgpu_fifo *f = &g->fifo;
@@ -1339,3 +1344,53 @@ void nvgpu_runlist_unlock_runlists(struct gk20a *g, u32 runlists_mask)
 		}
 	}
 }
+
+s32 nvgpu_runlist_get_runlist_info(struct gk20a *g, u32 rl_index, u32 *runlist_id,
+		u8 *device_id)
+{
+	struct nvgpu_fifo *f = &g->fifo;
+	s32 err = 0;
+	u32 device_id_u32 = 0;
+	struct nvgpu_runlist *runlist = &f->active_runlists[rl_index];
+
+	err = (s32)(nvgpu_runlist_get_device_id(g, runlist, &device_id_u32));
+	if (err != 0) {
+		nvgpu_err(g, "error in getting device ID");
+		goto exit;
+	}
+
+	*device_id = nvgpu_safe_cast_u32_to_u8(device_id_u32);
+	*runlist_id = runlist->id;
+exit:
+	return err;
+}
+
+s32 nvgpu_runlist_get_device_id(struct gk20a *g, struct nvgpu_runlist *rl, u32 *device_id)
+{
+	u8 dev;
+	s32 err = 0;
+
+	for (dev = 0; dev < (u8)(RLENG_PER_RUNLIST_SIZE); dev++) {
+		u32 rl_pribase =rl->rl_dev_list[dev]->rl_pri_base;
+		if (rl->runlist_pri_base == rl_pribase) {
+			*device_id = rl->rl_dev_list[dev]->engine_id;
+			goto exit;
+		}
+	}
+
+	err = (s32)(-EINVAL);
+	nvgpu_err(g, "Get device ID failed:");
+exit:
+	return err;
+}
+
+u32 nvgpu_runlist_get_num_runlists(struct gk20a *g)
+{
+	struct nvgpu_fifo f = g->fifo;
+	return f.num_runlists;
+}
+
+struct nvgpu_runlist_domain *nvgpu_runlist_get_shadow_domain(struct gk20a *g)
+{
+	return g->fifo.active_runlists[0].shadow_rl_domain;
+}
\ No newline at end of file
diff --git a/drivers/gpu/nvgpu/common/gsp_scheduler/gsp_nvs.c b/drivers/gpu/nvgpu/common/gsp_scheduler/gsp_nvs.c
new file mode 100644
index 000000000..dadf06f2b
--- /dev/null
+++ b/drivers/gpu/nvgpu/common/gsp_scheduler/gsp_nvs.c
@@ -0,0 +1,173 @@
+#include <nvgpu/gk20a.h>
+#include <nvgpu/log.h>
+#include <nvgpu/gsp.h>
+#include <nvgpu/runlist.h>
+#include <nvgpu/string.h>
+
+#ifdef CONFIG_NVS_PRESENT
+#include <nvgpu/nvs.h>
+#endif
+
+#include <nvgpu/gsp_sched.h>
+#include <nvgpu/device.h>
+#include <nvgpu/utils.h>
+#include "gsp_runlist.h"
+
+static int gsp_nvs_update_runlist_info(struct gk20a *g,
+            struct nvgpu_gsp_runlist_info *gsp_runlist, struct nvgpu_runlist *rl)
+{
+    int err = 0;
+    u64 runlist_iova = nvgpu_mem_get_addr(g, &rl->domain->mem_hw->mem);
+    u32 num_entries = rl->domain->mem_hw->count;
+    u32 aperture = g->ops.runlist.get_runlist_aperture(g, &rl->domain->mem_hw->mem);
+    u32 device_id = 0;
+
+    nvgpu_gsp_dbg(g, " ");
+
+    gsp_runlist->domain_id = u64_lo32(rl->domain->domain_id);
+    gsp_runlist->runlist_id = rl->id;
+    gsp_runlist->aperture = aperture;
+    gsp_runlist->runlist_base_lo = u64_lo32(runlist_iova);
+    gsp_runlist->runlist_base_hi = u64_hi32(runlist_iova);
+    gsp_runlist->num_entries = num_entries;
+    gsp_runlist->is_runlist_valid = true;
+
+    err = nvgpu_runlist_get_device_id(g, rl, &device_id);
+    if (err != 0) {
+        nvgpu_err(g, "updating engine ID to gsp runlist info failed");
+    }
+    gsp_runlist->device_id = nvgpu_safe_cast_u32_to_u8(device_id);
+    return err;
+
+}
+
+#ifdef CONFIG_NVS_PRESENT
+
+static int gsp_nvs_get_runlist_info(struct gk20a *g, struct nvgpu_gsp_domain_info *gsp_domain,
+        u64 nvgpu_domain_id)
+{
+    u32 num_runlists;
+    int err = 0;
+    u64 runlist_iova = 0;
+    u32 num_entries = 0;
+    u32 aperture = 0;
+    u32 runlist_id;
+    u8 device_id;
+    u32 i;
+    struct nvgpu_gsp_runlist_info *gsp_runlist;
+    nvgpu_gsp_dbg(g, " ");
+
+    num_runlists = nvgpu_runlist_get_num_runlists(g);
+    for (i = 0; i < num_runlists; i++) {
+        gsp_runlist = &gsp_domain->runlist_info[i];
+
+        err = nvgpu_nvs_gsp_get_runlist_domain_info(g, nvgpu_domain_id, &num_entries,
+                &runlist_iova, &aperture, i);
+        if (err != 0) {
+            nvgpu_err(g, "gsp error in getting domain info ID: %u", gsp_domain->domain_id);
+            continue;
+        }
+
+        err = nvgpu_runlist_get_runlist_info(g, i, &runlist_id, &device_id);
+        if( err != 0) {
+            nvgpu_err(g, "gsp error in getting runlist info Index: %u", i);
+            continue;
+        }
+        gsp_runlist->aperture = aperture;
+        gsp_runlist->device_id = device_id;
+        gsp_runlist->domain_id = gsp_domain->domain_id;
+        gsp_runlist->is_runlist_valid = true;
+        gsp_runlist->num_entries = num_entries;
+        gsp_runlist->runlist_base_lo = u64_lo32(runlist_iova);
+        gsp_runlist->runlist_base_hi = u64_hi32(runlist_iova);
+        gsp_runlist->runlist_id = runlist_id;
+
+    }
+return err;
+}
+
+static int gsp_nvs_get_domain_info(struct gk20a *g, u64 nvgpu_domain_id,
+                                struct nvgpu_gsp_domain_info *gsp_domain)
+{
+    int err = 0;
+    u32 domain_id;
+    u32 timeslice_ns;
+    nvgpu_gsp_dbg(g, " ");
+    nvgpu_nvs_get_gsp_domain_info(g, nvgpu_domain_id,
+            &domain_id, &timeslice_ns);
+
+    gsp_domain->domain_id = domain_id;
+    gsp_domain->priority = 0;
+    gsp_domain->time_slicing = timeslice_ns;
+    err = gsp_nvs_get_runlist_info(g, gsp_domain, nvgpu_domain_id);
+    if (err != 0) {
+        nvgpu_err(g, "copy of gsp runlist info failed");
+        goto exit;
+    }
+exit:
+    return err;
+}
+#endif
+
+#ifdef CONFIG_NVS_PRESENT
+/* this function adds nvs domain info to the gsp domain info containers */
+int nvgpu_gsp_nvs_add_domain(struct gk20a *g, u64 nvgpu_domain_id)
+{
+    struct nvgpu_gsp_domain_info gsp_domain = { };
+    int err = 0;
+
+    nvgpu_gsp_dbg(g, " ");
+
+    err = gsp_nvs_get_domain_info(g, nvgpu_domain_id, &gsp_domain);
+    if (err != 0) {
+        nvgpu_err(g, " gsp domain data copy to cmd buffer failed");
+        goto exit;
+    }
+
+    err = nvgpu_gsp_sched_domain_add(g, &gsp_domain);
+    if (err != 0) {
+        nvgpu_err(g, "gsp add domain failed");
+        goto exit;
+    }
+
+exit:
+    return err;
+}
+#endif
+
+/* function to request delete the domain by id */
+int nvgpu_gsp_nvs_delete_domain(struct gk20a *g, u64 nvgpu_domain_id)
+{
+    int err = 0;
+    nvgpu_gsp_dbg(g, " ");
+    // request for deletion of the domain with id
+    err = nvgpu_gsp_sched_domain_delete(g, u64_lo32(nvgpu_domain_id));
+    if (err != 0) {
+        nvgpu_err(g, "domain delete failed");
+    }
+    return err;
+}
+
+/* funtion to update the runlist domain of gsp */
+int nvgpu_gps_sched_update_runlist(struct gk20a *g, struct nvgpu_runlist *rl)
+{
+    struct nvgpu_gsp_runlist_info gsp_runlist = { };
+    int err = 0;
+
+    nvgpu_gsp_dbg(g, " ");
+    /* copy runlist data to cmd buffer */
+    err = gsp_nvs_update_runlist_info(g, &gsp_runlist, rl);
+    if (err != 0){
+        nvgpu_err(g, "gsp runlist update to cmd failed");
+        goto exit;
+    }
+
+    err = nvgpu_gsp_sched_runlist_update(g, &gsp_runlist);
+    if (err != 0) {
+        nvgpu_err(g, "command buffer for runlist sent failed");
+        goto exit;
+    }
+
+exit:
+    return err;
+}
diff --git a/drivers/gpu/nvgpu/common/gsp_scheduler/gsp_runlist.c b/drivers/gpu/nvgpu/common/gsp_scheduler/gsp_runlist.c
index 7ca073317..826e4b9dd 100644
--- a/drivers/gpu/nvgpu/common/gsp_scheduler/gsp_runlist.c
+++ b/drivers/gpu/nvgpu/common/gsp_scheduler/gsp_runlist.c
@@ -147,12 +147,11 @@ static int gsp_get_async_ce(struct gk20a *g, struct nvgpu_device *device,
 	return 0;
 }
 
-static void gsp_get_device_info(struct gk20a *g, u8 device_id,
-		struct nvgpu_gsp_device_info *dev_info,
+static void gsp_get_device_info(struct gk20a *g, struct nvgpu_gsp_device_info *dev_info,
 		const struct nvgpu_device *device)
 {
 	/* copy domain info into cmd buffer */
-	dev_info->device_id = device_id;
+	dev_info->device_id = nvgpu_safe_cast_u32_to_u8(device->engine_id);
 	dev_info->is_engine = true;
 	dev_info->engine_type = device->type;
 	dev_info->engine_id = device->engine_id;
@@ -165,7 +164,7 @@ static void gsp_get_device_info(struct gk20a *g, u8 device_id,
 }
 
 static int gsp_sched_send_devices_info(struct gk20a *g,
-		u8 device_id, const struct nvgpu_device *device)
+		 const struct nvgpu_device *device)
 {
 	struct nv_flcn_cmd_gsp cmd = { };
 	int err = 0;
@@ -173,7 +172,7 @@ static int gsp_sched_send_devices_info(struct gk20a *g,
 	nvgpu_gsp_dbg(g, " ");
 
 	/* copy domain info into cmd buffer */
-	gsp_get_device_info(g, device_id, &cmd.cmd.device, device);
+	gsp_get_device_info(g, &cmd.cmd.device, device);
 
 	err = gsp_send_cmd_and_wait_for_ack(g, &cmd,
 		NV_GSP_UNIT_DEVICES_INFO, sizeof(struct nvgpu_gsp_device_info));
@@ -185,37 +184,33 @@ int nvgpu_gsp_sched_send_devices_info(struct gk20a *g)
 {
 	const struct nvgpu_device *gr_dev = NULL;
 	struct nvgpu_device ce_dev = { };
-	u8 instance = 0;
 	int err = 0;
+	u8 engine_instance = 0;
+	for (engine_instance = 0; engine_instance < GSP_SCHED_ENGINE_INSTANCE; engine_instance++) {
+		// handling GR engine
+		gr_dev = nvgpu_device_get(g, NVGPU_DEVTYPE_GRAPHICS, engine_instance);
+		if (gr_dev == NULL) {
+			err = -ENXIO;
+			nvgpu_err(g, " Get GR device info failed ID: %d", engine_instance);
+			goto exit;
+		}
+		err = gsp_sched_send_devices_info(g, gr_dev);
+		if (err != 0) {
+			nvgpu_err(g, "Sending GR engine info failed ID: %d", engine_instance);
+			goto exit;
+		}
 
-	/*
-	 * Only GR0 is supported
-	 */
-	gr_dev = nvgpu_device_get(g, NVGPU_DEVTYPE_GRAPHICS, instance);
-	if (gr_dev == NULL) {
-		nvgpu_err(g, "Get GR0 device info failed");
-		goto exit;
-	}
-	err = gsp_sched_send_devices_info(g,
-			GSP_SCHED_GR0_DEVICE_ID, gr_dev);
-	if (err != 0) {
-		nvgpu_err(g, "send GR0 device info failed");
-		goto exit;
-	}
-
-	/*
-	 * Only Async CE0 is supported
-	 */
-	err = gsp_get_async_ce(g, &ce_dev, instance);
-	if (err != 0) {
-		nvgpu_err(g, "Get Async CE0 device info failed");
-		goto exit;
-	}
-	err = gsp_sched_send_devices_info(g,
-			GSP_SCHED_ASYNC_CE0_DEVICE_ID, &ce_dev);
-	if (err != 0) {
-		nvgpu_err(g, "send Async CE0 device info failed");
-		goto exit;
+		// handling Async engine
+		err = gsp_get_async_ce(g, &ce_dev, engine_instance);
+		if (err != 0) {
+			nvgpu_err(g, "Getting Async engine failed ID: %d", engine_instance);
+			goto exit;
+		}
+		err = gsp_sched_send_devices_info(g, &ce_dev);
+		if (err != 0) {
+			nvgpu_err(g, "Sending Async engin info failed ID: %d", engine_instance);
+			goto exit;
+		}
 	}
 
 exit:
diff --git a/drivers/gpu/nvgpu/common/gsp_scheduler/gsp_runlist.h b/drivers/gpu/nvgpu/common/gsp_scheduler/gsp_runlist.h
index 3234d64df..55a956061 100644
--- a/drivers/gpu/nvgpu/common/gsp_scheduler/gsp_runlist.h
+++ b/drivers/gpu/nvgpu/common/gsp_scheduler/gsp_runlist.h
@@ -23,9 +23,7 @@
 #ifndef NVGPU_GSP_RUNLIST
 #define NVGPU_GSP_RUNLIST
 
-#define GSP_SCHED_GR0_DEVICE_ID			0U
-#define GSP_SCHED_ASYNC_CE0_DEVICE_ID	1U
-
+#define GSP_SCHED_ENGINE_INSTANCE		2U
 struct nv_flcn_cmd_gsp;
 struct gk20a;
 struct nvgpu_gsp_device_info {
diff --git a/drivers/gpu/nvgpu/common/nvs/nvs_sched.c b/drivers/gpu/nvgpu/common/nvs/nvs_sched.c
index d5202d194..bc3080bb3 100644
--- a/drivers/gpu/nvgpu/common/nvs/nvs_sched.c
+++ b/drivers/gpu/nvgpu/common/nvs/nvs_sched.c
@@ -30,6 +30,9 @@
 #include <nvgpu/runlist.h>
 #include <nvgpu/kref.h>
 
+#ifdef CONFIG_NVGPU_GSP_SCHEDULER
+#include <nvgpu/gsp_sched.h>
+#endif
 static struct nvs_sched_ops nvgpu_nvs_ops = {
 	.preempt = NULL,
 	.recover = NULL,
@@ -61,10 +64,6 @@ struct nvgpu_nvs_worker_item {
 	nvgpu_atomic_t state;
 };
 
-
-static struct nvgpu_nvs_domain *
-nvgpu_nvs_domain_by_id_locked(struct gk20a *g, u64 domain_id);
-
 static inline struct nvgpu_nvs_worker_item *
 nvgpu_nvs_worker_item_from_worker_item(struct nvgpu_list_node *node)
 {
@@ -836,7 +835,7 @@ unlock:
 	return err;
 }
 
-static struct nvgpu_nvs_domain *
+struct nvgpu_nvs_domain *
 nvgpu_nvs_domain_by_id_locked(struct gk20a *g, u64 domain_id)
 {
 	struct nvgpu_nvs_scheduler *sched = g->scheduler;
@@ -851,10 +850,16 @@ nvgpu_nvs_domain_by_id_locked(struct gk20a *g, u64 domain_id)
 			return nvgpu_dom;
 		}
 	}
-
+	
 	return NULL;
 }
 
+struct nvgpu_nvs_domain *
+nvgpu_nvs_get_shadow_domain_locked(struct gk20a *g)
+{
+	return g->scheduler->shadow_domain;
+}
+
 struct nvgpu_nvs_domain *
 nvgpu_nvs_domain_by_id(struct gk20a *g, u64 domain_id)
 {
@@ -1037,3 +1042,69 @@ void nvgpu_nvs_print_domain(struct gk20a *g, struct nvgpu_nvs_domain *domain)
 	nvs_dbg(g, "  preempt grace: %llu ns", nvs_dom->preempt_grace_ns);
 	nvs_dbg(g, "  domain ID:     %llu", domain->id);
 }
+
+#ifdef CONFIG_NVGPU_GSP_SCHEDULER
+s32 nvgpu_nvs_gsp_get_runlist_domain_info(struct gk20a *g, u64 nvgpu_domain_id,
+		u32 *num_entries, u64 *runlist_iova, u32 *aperture, u32 index)
+{
+	struct nvgpu_runlist_domain *domain;
+	struct nvgpu_nvs_domain *nvgpu_domain;
+	s32 err = 0;
+
+	if (nvgpu_domain_id == (u64)(SHADOW_DOMAIN_ID)) {
+		nvgpu_domain = nvgpu_nvs_get_shadow_domain_locked(g);
+		if (nvgpu_domain == NULL) {
+			nvgpu_err(g, "gsp nvgpu_domain is NULL");
+			err = -ENXIO;
+			goto exit;
+		}
+
+		domain = nvgpu_runlist_get_shadow_domain(g);
+	} else {
+		nvgpu_domain = nvgpu_nvs_domain_by_id_locked(g, nvgpu_domain_id);
+		if (nvgpu_domain == NULL) {
+			nvgpu_err(g, "gsp nvgpu_domain is NULL");
+			err = -ENXIO;
+			goto exit;
+		}
+
+		domain = nvgpu_domain->rl_domains[index];
+	}
+
+	if (domain == NULL) {
+		nvgpu_err(g, "gsp runlist domain is NULL");
+		err = -ENXIO;
+		goto exit;
+	}
+
+	*runlist_iova = nvgpu_mem_get_addr(g, &domain->mem_hw->mem);
+	*aperture = g->ops.runlist.get_runlist_aperture(g, &domain->mem_hw->mem);
+	*num_entries = domain->mem_hw->count;
+exit:
+	return err;
+}
+
+s32 nvgpu_nvs_get_gsp_domain_info(struct gk20a *g, u64 nvgpu_domain_id,
+		u32 *domain_id, u32 *timeslice_ns)
+{
+	struct nvgpu_nvs_domain *nvgpu_domain;
+    s32 err = 0;
+
+    if (nvgpu_domain_id == SHADOW_DOMAIN_ID) {
+        nvgpu_domain = nvgpu_nvs_get_shadow_domain_locked(g);
+    } else {
+        nvgpu_domain = nvgpu_nvs_domain_by_id_locked(g, nvgpu_domain_id);
+    }
+
+    if (nvgpu_domain == NULL) {
+        nvgpu_err(g, "gsp nvgpu_domain is NULL");
+        err = -ENXIO;
+		goto exit;
+    }
+	*domain_id = u64_lo32(nvgpu_domain->id);
+	*timeslice_ns = nvgpu_safe_cast_u64_to_u32(
+			nvgpu_domain->parent->timeslice_ns);
+exit:
+	return err;
+}
+#endif
diff --git a/drivers/gpu/nvgpu/hal/fifo/runlist_fifo_ga10b.h b/drivers/gpu/nvgpu/hal/fifo/runlist_fifo_ga10b.h
index 1dab63b8e..3064a8dac 100644
--- a/drivers/gpu/nvgpu/hal/fifo/runlist_fifo_ga10b.h
+++ b/drivers/gpu/nvgpu/hal/fifo/runlist_fifo_ga10b.h
@@ -36,7 +36,7 @@ void ga10b_runlist_hw_submit(struct gk20a *g, struct nvgpu_runlist *runlist);
 int ga10b_runlist_check_pending(struct gk20a *g, struct nvgpu_runlist *runlist);
 void ga10b_runlist_write_state(struct gk20a *g, u32 runlists_mask,
 				u32 runlist_state);
-u32 ga10b_get_runlist_aperture(struct gk20a *g, struct nvgpu_runlist *runlist);
+u32 ga10b_get_runlist_aperture(struct gk20a *g, struct nvgpu_mem *mem);
 #ifdef CONFIG_NVGPU_CHANNEL_TSG_SCHEDULING
 int ga10b_fifo_reschedule_preempt_next(struct nvgpu_channel *ch,
 		bool wait_preempt);
diff --git a/drivers/gpu/nvgpu/hal/fifo/runlist_fifo_ga10b_fusa.c b/drivers/gpu/nvgpu/hal/fifo/runlist_fifo_ga10b_fusa.c
index 0fed0ea5b..d168a2282 100644
--- a/drivers/gpu/nvgpu/hal/fifo/runlist_fifo_ga10b_fusa.c
+++ b/drivers/gpu/nvgpu/hal/fifo/runlist_fifo_ga10b_fusa.c
@@ -93,9 +93,9 @@ int ga10b_runlist_check_pending(struct gk20a *g, struct nvgpu_runlist *runlist)
 	return ret;
 }
 
-u32 ga10b_get_runlist_aperture(struct gk20a *g, struct nvgpu_runlist *runlist)
+u32 ga10b_get_runlist_aperture(struct gk20a *g, struct nvgpu_mem *mem)
 {
-	return nvgpu_aperture_mask(g, &runlist->domain->mem_hw->mem,
+	return nvgpu_aperture_mask(g, mem,
 			runlist_submit_base_lo_target_sys_mem_noncoherent_f(),
 			runlist_submit_base_lo_target_sys_mem_coherent_f(),
 			runlist_submit_base_lo_target_vid_mem_f());
diff --git a/drivers/gpu/nvgpu/include/nvgpu/gops/runlist.h b/drivers/gpu/nvgpu/include/nvgpu/gops/runlist.h
index ba821186e..2a679a60a 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/gops/runlist.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/gops/runlist.h
@@ -102,7 +102,7 @@ struct gops_runlist {
 	void (*init_enginfo)(struct gk20a *g, struct nvgpu_fifo *f);
 	u32 (*get_tsg_max_timeslice)(void);
 	u32 (*get_runlist_id)(struct gk20a *g, u32 runlist_pri_base);
-	u32 (*get_runlist_aperture)(struct gk20a *g, struct nvgpu_runlist *runlist);
+	u32 (*get_runlist_aperture)(struct gk20a *g, struct nvgpu_mem *mem);
 	u32 (*get_engine_id_from_rleng_id)(struct gk20a *g,
 				u32 rleng_id, u32 runlist_pri_base);
 	u32 (*get_chram_bar0_offset)(struct gk20a *g, u32 runlist_pri_base);
diff --git a/drivers/gpu/nvgpu/include/nvgpu/gsp_sched.h b/drivers/gpu/nvgpu/include/nvgpu/gsp_sched.h
index 2c1ea8216..2f8b50341 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/gsp_sched.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/gsp_sched.h
@@ -24,13 +24,13 @@
 #define GSP_SCHED_H
 struct gk20a;
 struct nvgpu_gsp_sched;
-
+struct nvgpu_runlist;
 /*
  * Scheduler shall support only two engines with two runlists per domain.
  * 1. GR0
  * 2. Async CE0
  */
-#define TOTAL_NO_OF_RUNLISTS 2U
+#define TOTAL_NO_OF_RUNLISTS 4U
 
 struct nvgpu_gsp_runlist_info {
 	/*
@@ -117,4 +117,9 @@ int nvgpu_gsp_sched_query_active_domain(struct gk20a *g, u32 *active_domain);
 int nvgpu_gsp_sched_query_no_of_domains(struct gk20a *g, u32 *no_of_domains);
 int nvgpu_gsp_sched_start(struct gk20a *g);
 int nvgpu_gsp_sched_stop(struct gk20a *g);
+/*  functions to get nvs scheduler and runlist domains info to gsp */
+int nvgpu_gsp_nvs_add_domain(struct gk20a *g, u64 nvgpu_domain_id);
+int nvgpu_gsp_nvs_delete_domain(struct gk20a *g, u64 nvgpu_domain_id);
+int nvgpu_gsp_nvs_update_runlist(struct gk20a *g, const char *name,struct nvgpu_runlist *rl);
+int nvgpu_gps_sched_update_runlist(struct gk20a *g, struct nvgpu_runlist *rl);
 #endif /* GSP_SCHED_H */
diff --git a/drivers/gpu/nvgpu/include/nvgpu/nvs.h b/drivers/gpu/nvgpu/include/nvgpu/nvs.h
index f6abd3daf..bf895940b 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/nvs.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/nvs.h
@@ -48,6 +48,7 @@ struct nvgpu_runlist;
 struct nvgpu_runlist_domain;
 struct nvgpu_nvs_ctrl_queue;
 struct nvgpu_nvs_domain_ctrl_fifo;
+struct nvgpu_nvs_domain;
 
 struct nvs_domain_ctrl_fifo_capabilities {
 	/* Store type of scheduler backend */
@@ -296,6 +297,9 @@ bool nvgpu_nvs_ctrl_fifo_user_is_subscribed_to_queue(struct nvs_domain_ctrl_fifo
 		struct nvgpu_nvs_ctrl_queue *queue);
 void nvgpu_nvs_ctrl_fifo_erase_queue(struct gk20a *g, struct nvgpu_nvs_ctrl_queue *queue);
 void nvgpu_nvs_ctrl_fifo_erase_all_queues(struct gk20a *g);
+struct nvgpu_nvs_domain *
+nvgpu_nvs_get_shadow_domain_locked(struct gk20a *g);
+struct nvgpu_nvs_domain *nvgpu_nvs_domain_by_id_locked(struct gk20a *g, u64 domain_id);
 
 #else
 
@@ -340,6 +344,24 @@ static inline const char *nvgpu_nvs_domain_get_name(struct nvgpu_nvs_domain *dom
 	(void)dom;
 	return NULL;
 }
+static inline struct nvgpu_nvs_domain *
+nvgpu_nvs_get_shadow_domain_locked(struct gk20a *g)
+{
+	(void)g;
+	return NULL;
+}
+static inline struct nvgpu_nvs_domain *nvgpu_nvs_domain_by_id_locked(struct gk20a *g, u64 domain_id)
+{
+	(void)g;
+	return NULL;
+	(void)domain_id;
+}
 #endif
 
+#ifdef CONFIG_NVGPU_GSP_SCHEDULER
+s32 nvgpu_nvs_gsp_get_runlist_domain_info(struct gk20a *g, u64 nvgpu_domain_id, u32 *num_entries,
+	u64 *runlist_iova, u32 *aperture, u32 index);
+s32 nvgpu_nvs_get_gsp_domain_info(struct gk20a *g, u64 nvgpu_domain_id,
+		u32 *domain_id, u32 *timeslice_ns);
+#endif
 #endif
diff --git a/drivers/gpu/nvgpu/include/nvgpu/runlist.h b/drivers/gpu/nvgpu/include/nvgpu/runlist.h
index 042e02a56..aef214fda 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/runlist.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/runlist.h
@@ -39,7 +39,12 @@ struct nvgpu_tsg;
 struct nvgpu_fifo;
 struct nvgpu_channel;
 struct nvgpu_device;
-
+#ifdef CONFIG_NVGPU_GSP_SCHEDULER
+struct nvgpu_gsp_domain_info;
+#endif
+#ifdef CONFIG_NVS_PRESENT
+struct nvgpu_nvs_domain;
+#endif
 /** @cond DOXYGEN_SHOULD_SKIP_THIS */
 struct nvgpu_pbdma_info;
 
@@ -510,4 +515,10 @@ void nvgpu_runlist_init_enginfo(struct gk20a *g, struct nvgpu_fifo *f);
 #define rl_dbg(g, fmt, arg...)			\
 	nvgpu_log(g, gpu_dbg_runlists, "RL | " fmt, ##arg)
 
+/* function to get the runlist info for gsp */
+s32 nvgpu_runlist_get_device_id(struct gk20a *g, struct nvgpu_runlist *rl, u32 *device_id);
+s32 nvgpu_runlist_get_runlist_info(struct gk20a *g, u32 rl_index, u32 *runlist_id,
+		u8 *device_id);
+u32 nvgpu_runlist_get_num_runlists(struct gk20a *g);
+struct nvgpu_runlist_domain *nvgpu_runlist_get_shadow_domain(struct gk20a *g);
 #endif /* NVGPU_RUNLIST_H */