diff --git a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
index 4ea1f486b..7bb50ee9a 100644
--- a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
@@ -791,22 +791,14 @@ u32 gk20a_gr_tpc_offset(struct gk20a *g, u32 tpc)
 }
 
 int gr_gk20a_commit_global_ctx_buffers(struct gk20a *g,
-			struct channel_gk20a *c, bool patch)
+			struct nvgpu_gr_ctx *gr_ctx, bool patch)
 {
 	struct gr_gk20a *gr = &g->gr;
-	struct tsg_gk20a *tsg;
-	struct nvgpu_gr_ctx *gr_ctx = NULL;
 	u64 addr;
 	u32 size;
 
 	nvgpu_log_fn(g, " ");
 
-	tsg = tsg_gk20a_from_ch(c);
-	if (tsg == NULL) {
-		return -EINVAL;
-	}
-
-	gr_ctx = tsg->gr_ctx;
 	if (patch) {
 		int err;
 		err = gr_gk20a_ctx_patch_write_begin(g, gr_ctx, false);
@@ -1435,7 +1427,7 @@ static int gr_gk20a_init_golden_ctx_image(struct gk20a *g,
 	gk20a_writel(g, gr_fe_go_idle_timeout_r(),
 		gr_fe_go_idle_timeout_count_disabled_f());
 
-	err = g->ops.gr.commit_global_ctx_buffers(g, c, false);
+	err = g->ops.gr.commit_global_ctx_buffers(g, gr_ctx, false);
 	if (err != 0U) {
 		goto clean_up;
 	}
@@ -2932,7 +2924,7 @@ int gk20a_alloc_obj_ctx(struct channel_gk20a  *c, u32 class_num, u32 flags)
 				"fail to map global ctx buffer");
 			goto out;
 		}
-		g->ops.gr.commit_global_ctx_buffers(g, c, true);
+		g->ops.gr.commit_global_ctx_buffers(g, gr_ctx, true);
 
 		/* commit gr ctx buffer */
 		err = g->ops.gr.commit_inst(c, gr_ctx->mem.gpu_va);
diff --git a/drivers/gpu/nvgpu/gk20a/gr_gk20a.h b/drivers/gpu/nvgpu/gk20a/gr_gk20a.h
index 14a07466a..97c4c1223 100644
--- a/drivers/gpu/nvgpu/gk20a/gr_gk20a.h
+++ b/drivers/gpu/nvgpu/gk20a/gr_gk20a.h
@@ -755,7 +755,7 @@ int gr_gk20a_alloc_global_ctx_buffers(struct gk20a *g);
 int gr_gk20a_map_global_ctx_buffers(struct gk20a *g,
 				struct channel_gk20a *c);
 int gr_gk20a_commit_global_ctx_buffers(struct gk20a *g,
-			struct channel_gk20a *c, bool patch);
+			struct nvgpu_gr_ctx *gr_ctx, bool patch);
 
 int gr_gk20a_fecs_ctx_bind_channel(struct gk20a *g,
 					struct channel_gk20a *c);
diff --git a/drivers/gpu/nvgpu/include/nvgpu/gk20a.h b/drivers/gpu/nvgpu/include/nvgpu/gk20a.h
index 8721fed12..f3bbd8b70 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/gk20a.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/gk20a.h
@@ -521,7 +521,7 @@ struct gpu_ops {
 		int (*map_global_ctx_buffers)(struct gk20a *g,
 			struct channel_gk20a *c);
 		int (*commit_global_ctx_buffers)(struct gk20a *g,
-			struct channel_gk20a *c, bool patch);
+			struct nvgpu_gr_ctx *gr_ctx, bool patch);
 		u32 (*get_nonpes_aware_tpc)(struct gk20a *g, u32 gpc, u32 tpc);
 		int (*get_offset_in_gpccs_segment)(struct gk20a *g,
 			enum ctxsw_addr_type addr_type, u32 num_tpcs,
diff --git a/drivers/gpu/nvgpu/tu104/gr_tu104.c b/drivers/gpu/nvgpu/tu104/gr_tu104.c
index bb7a4cef2..e5ac67c30 100644
--- a/drivers/gpu/nvgpu/tu104/gr_tu104.c
+++ b/drivers/gpu/nvgpu/tu104/gr_tu104.c
@@ -220,25 +220,17 @@ static void gr_tu104_commit_rtv_circular_buffer(struct gk20a *g,
 }
 
 int gr_tu104_commit_global_ctx_buffers(struct gk20a *g,
-			struct channel_gk20a *ch, bool patch)
+			struct nvgpu_gr_ctx *gr_ctx, bool patch)
 {
 	int err;
-	struct tsg_gk20a *tsg;
-	struct nvgpu_gr_ctx *gr_ctx = NULL;
 	u64 addr;
 	u32 size;
 
-	err = gr_gk20a_commit_global_ctx_buffers(g, ch, patch);
+	err = gr_gk20a_commit_global_ctx_buffers(g, gr_ctx, patch);
 	if (err != 0) {
 		return err;
 	}
 
-	tsg = tsg_gk20a_from_ch(ch);
-	if (tsg == NULL) {
-		return -EINVAL;
-	}
-
-	gr_ctx = tsg->gr_ctx;
 	if (patch) {
 		int err;
 		err = gr_gk20a_ctx_patch_write_begin(g, gr_ctx, false);
diff --git a/drivers/gpu/nvgpu/tu104/gr_tu104.h b/drivers/gpu/nvgpu/tu104/gr_tu104.h
index 3c2f295cf..97501f12d 100644
--- a/drivers/gpu/nvgpu/tu104/gr_tu104.h
+++ b/drivers/gpu/nvgpu/tu104/gr_tu104.h
@@ -72,7 +72,7 @@ int gr_tu104_alloc_global_ctx_buffers(struct gk20a *g);
 int gr_tu104_map_global_ctx_buffers(struct gk20a *g,
 		struct channel_gk20a *ch);
 int gr_tu104_commit_global_ctx_buffers(struct gk20a *g,
-			struct channel_gk20a *ch, bool patch);
+			struct nvgpu_gr_ctx *gr_ctx, bool patch);
 
 void gr_tu104_bundle_cb_defaults(struct gk20a *g);
 void gr_tu104_cb_size_default(struct gk20a *g);