diff --git a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
index b218397aa..d787a693f 100644
--- a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
@@ -1763,9 +1763,6 @@ int gr_gk20a_update_hwpm_ctxsw_mode(struct gk20a *g,
 				return -ENOMEM;
 			}
 		}
-
-		/* Now clear the buffer */
-		nvgpu_memset(g, &pm_ctx->mem, 0, 0, pm_ctx->mem.size);
 	}
 
 	data = nvgpu_mem_rd(g, gr_mem, ctxsw_prog_main_image_pm_o());
diff --git a/drivers/gpu/nvgpu/gv11b/subctx_gv11b.c b/drivers/gpu/nvgpu/gv11b/subctx_gv11b.c
index 4f8de196c..b0bcb5855 100644
--- a/drivers/gpu/nvgpu/gv11b/subctx_gv11b.c
+++ b/drivers/gpu/nvgpu/gv11b/subctx_gv11b.c
@@ -79,8 +79,6 @@ int gv11b_alloc_subctx_header(struct channel_gk20a *c)
 			nvgpu_dma_free(g, &ctx->mem);
 			return -ENOMEM;
 		}
-		/* Now clear the buffer */
-		nvgpu_memset(g, &ctx->mem, 0, 0, ctx->mem.size);
 	}
 	return ret;
 }