2 files changed, 3 insertions, 0 deletions

diff --git a/drivers/gpu/nvgpu/include/nvgpu/vgpu/tegra_vgpu.h b/drivers/gpu/nvgpu/include/nvgpu/vgpu/tegra_vgpu.h
index a7a877ff..c269dc24 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/vgpu/tegra_vgpu.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/vgpu/tegra_vgpu.h
@@ -369,6 +369,7 @@ struct tegra_vgpu_gr_ctx_params {
         u64 as_handle;
         u64 gr_ctx_va;
         u32 class_num;
+        u32 tsg_id;
 };
 
 struct tegra_vgpu_channel_bind_gr_ctx_params {
diff --git a/drivers/gpu/nvgpu/vgpu/gr_vgpu.c b/drivers/gpu/nvgpu/vgpu/gr_vgpu.c
index 4a3cf075..c7996fd9 100644
--- a/drivers/gpu/nvgpu/vgpu/gr_vgpu.c
+++ b/drivers/gpu/nvgpu/vgpu/gr_vgpu.c
@@ -302,6 +302,7 @@ int vgpu_gr_alloc_gr_ctx(struct gk20a *g,
         p->as_handle = vm->handle;
         p->gr_ctx_va = gr_ctx->mem.gpu_va;
         p->class_num = class;
+        p->tsg_id = gr_ctx->tsgid;
         err = vgpu_comm_sendrecv(&msg, sizeof(msg), sizeof(msg));
         err = err ? err : msg.ret;
 
@@ -501,6 +502,7 @@ int vgpu_gr_alloc_obj_ctx(struct channel_gk20a  *c, u32 class_num, u32 flags)
         if (!nvgpu_mem_is_valid(&gr_ctx->mem)) {
                 tsg->vm = c->vm;
                 nvgpu_vm_get(tsg->vm);
+                gr_ctx->tsgid = tsg->tsgid;
                 err = g->ops.gr.alloc_gr_ctx(g, gr_ctx,
                                         c->vm,
                                         class_num,