diff --git a/drivers/gpu/nvgpu/gv11b/gr_gv11b.c b/drivers/gpu/nvgpu/gv11b/gr_gv11b.c
index 568673aa3..223775220 100644
--- a/drivers/gpu/nvgpu/gv11b/gr_gv11b.c
+++ b/drivers/gpu/nvgpu/gv11b/gr_gv11b.c
@@ -1349,7 +1349,7 @@ int gr_gv11b_alloc_buffer(struct vm_gk20a *vm, size_t size,
 	mem->gpu_va = nvgpu_gmmu_map(vm,
 				mem,
 				size,
-				NVGPU_MAP_BUFFER_FLAGS_CACHEABLE_TRUE,
+				NVGPU_AS_MAP_BUFFER_FLAGS_CACHEABLE,
 				gk20a_mem_flag_none,
 				false,
 				mem->aperture);
diff --git a/drivers/gpu/nvgpu/gv11b/subctx_gv11b.c b/drivers/gpu/nvgpu/gv11b/subctx_gv11b.c
index 4951d3a46..864e24f09 100644
--- a/drivers/gpu/nvgpu/gv11b/subctx_gv11b.c
+++ b/drivers/gpu/nvgpu/gv11b/subctx_gv11b.c
@@ -75,7 +75,7 @@ int gv11b_alloc_subctx_header(struct channel_gk20a *c)
 		ctx->mem.gpu_va = nvgpu_gmmu_map(c->vm,
 					&ctx->mem,
 					ctx->mem.size,
-					NVGPU_MAP_BUFFER_FLAGS_CACHEABLE_FALSE,
+					0, /* not GPU-cacheable */
 					gk20a_mem_flag_none, true,
 					ctx->mem.aperture);
 		if (!ctx->mem.gpu_va) {