diff --git a/drivers/gpu/nvgpu/gk20a/gr_gk20a.h b/drivers/gpu/nvgpu/gk20a/gr_gk20a.h
index 2681c653f..d3df14344 100644
--- a/drivers/gpu/nvgpu/gk20a/gr_gk20a.h
+++ b/drivers/gpu/nvgpu/gk20a/gr_gk20a.h
@@ -416,10 +416,6 @@ struct nvgpu_gr_ctx {
 	bool boosted_ctx;
 	bool golden_img_loaded;
 
-#ifdef CONFIG_TEGRA_GR_VIRTUALIZATION
-	u64 virt_ctx;
-#endif
-
 	struct patch_desc	patch_ctx;
 	struct zcull_ctx_desc	zcull_ctx;
 	struct pm_ctx_desc	pm_ctx;
diff --git a/drivers/gpu/nvgpu/include/nvgpu/vgpu/tegra_vgpu.h b/drivers/gpu/nvgpu/include/nvgpu/vgpu/tegra_vgpu.h
index c8591835a..695972624 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/vgpu/tegra_vgpu.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/vgpu/tegra_vgpu.h
@@ -395,7 +395,6 @@ struct tegra_vgpu_ecc_counter_params {
 };
 
 struct tegra_vgpu_gr_ctx_params {
-	u64 gr_ctx_handle;
 	u64 as_handle;
 	u64 gr_ctx_va;
 	u32 class_num;
diff --git a/drivers/gpu/nvgpu/vgpu/gr_vgpu.c b/drivers/gpu/nvgpu/vgpu/gr_vgpu.c
index cefe6f7b5..dbfd8c282 100644
--- a/drivers/gpu/nvgpu/vgpu/gr_vgpu.c
+++ b/drivers/gpu/nvgpu/vgpu/gr_vgpu.c
@@ -335,8 +335,6 @@ int vgpu_gr_alloc_gr_ctx(struct gk20a *g,
 		__nvgpu_vm_free_va(vm, gr_ctx->mem.gpu_va,
 				   GMMU_PAGE_SIZE_KERNEL);
 		gr_ctx->mem.aperture = APERTURE_INVALID;
-	} else {
-		gr_ctx->virt_ctx = p->gr_ctx_handle;
 	}
 
 	return err;
@@ -429,7 +427,7 @@ void vgpu_gr_free_gr_ctx(struct gk20a *g,
 
 		msg.cmd = TEGRA_VGPU_CMD_GR_CTX_FREE;
 		msg.handle = vgpu_get_handle(g);
-		p->gr_ctx_handle = gr_ctx->virt_ctx;
+		p->tsg_id = gr_ctx->tsgid;
 		err = vgpu_comm_sendrecv(&msg, sizeof(msg), sizeof(msg));
 		WARN_ON(err || msg.ret);