summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a/gr_gk20a.c')
-rw-r--r--drivers/gpu/nvgpu/gk20a/gr_gk20a.c15
1 files changed, 8 insertions, 7 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
index e232bf17..cf9cab0e 100644
--- a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
@@ -1748,7 +1748,8 @@ static int gr_gk20a_init_ctxsw_ucode_vaspace(struct gk20a *g)
1748 &ucode_info->surface_desc.sgt, 1748 &ucode_info->surface_desc.sgt,
1749 ucode_info->surface_desc.size, 1749 ucode_info->surface_desc.size,
1750 0, /* flags */ 1750 0, /* flags */
1751 gk20a_mem_flag_read_only); 1751 gk20a_mem_flag_read_only,
1752 false);
1752 if (!ucode_info->surface_desc.gpu_va) { 1753 if (!ucode_info->surface_desc.gpu_va) {
1753 gk20a_err(d, "failed to update gmmu ptes\n"); 1754 gk20a_err(d, "failed to update gmmu ptes\n");
1754 return -ENOMEM; 1755 return -ENOMEM;
@@ -2375,7 +2376,7 @@ static int gr_gk20a_map_global_ctx_buffers(struct gk20a *g,
2375 2376
2376 gpu_va = gk20a_gmmu_map(ch_vm, &sgt, size, 2377 gpu_va = gk20a_gmmu_map(ch_vm, &sgt, size,
2377 NVGPU_MAP_BUFFER_FLAGS_CACHEABLE_TRUE, 2378 NVGPU_MAP_BUFFER_FLAGS_CACHEABLE_TRUE,
2378 gk20a_mem_flag_none); 2379 gk20a_mem_flag_none, true);
2379 if (!gpu_va) 2380 if (!gpu_va)
2380 goto clean_up; 2381 goto clean_up;
2381 g_bfr_va[CIRCULAR_VA] = gpu_va; 2382 g_bfr_va[CIRCULAR_VA] = gpu_va;
@@ -2392,7 +2393,7 @@ static int gr_gk20a_map_global_ctx_buffers(struct gk20a *g,
2392 2393
2393 gpu_va = gk20a_gmmu_map(ch_vm, &sgt, size, 2394 gpu_va = gk20a_gmmu_map(ch_vm, &sgt, size,
2394 NVGPU_MAP_BUFFER_FLAGS_CACHEABLE_TRUE, 2395 NVGPU_MAP_BUFFER_FLAGS_CACHEABLE_TRUE,
2395 gk20a_mem_flag_none); 2396 gk20a_mem_flag_none, false);
2396 if (!gpu_va) 2397 if (!gpu_va)
2397 goto clean_up; 2398 goto clean_up;
2398 g_bfr_va[ATTRIBUTE_VA] = gpu_va; 2399 g_bfr_va[ATTRIBUTE_VA] = gpu_va;
@@ -2409,7 +2410,7 @@ static int gr_gk20a_map_global_ctx_buffers(struct gk20a *g,
2409 2410
2410 gpu_va = gk20a_gmmu_map(ch_vm, &sgt, size, 2411 gpu_va = gk20a_gmmu_map(ch_vm, &sgt, size,
2411 NVGPU_MAP_BUFFER_FLAGS_CACHEABLE_TRUE, 2412 NVGPU_MAP_BUFFER_FLAGS_CACHEABLE_TRUE,
2412 gk20a_mem_flag_none); 2413 gk20a_mem_flag_none, true);
2413 if (!gpu_va) 2414 if (!gpu_va)
2414 goto clean_up; 2415 goto clean_up;
2415 g_bfr_va[PAGEPOOL_VA] = gpu_va; 2416 g_bfr_va[PAGEPOOL_VA] = gpu_va;
@@ -2419,7 +2420,7 @@ static int gr_gk20a_map_global_ctx_buffers(struct gk20a *g,
2419 sgt = gr->global_ctx_buffer[GOLDEN_CTX].mem.sgt; 2420 sgt = gr->global_ctx_buffer[GOLDEN_CTX].mem.sgt;
2420 size = gr->global_ctx_buffer[GOLDEN_CTX].mem.size; 2421 size = gr->global_ctx_buffer[GOLDEN_CTX].mem.size;
2421 gpu_va = gk20a_gmmu_map(ch_vm, &sgt, size, 0, 2422 gpu_va = gk20a_gmmu_map(ch_vm, &sgt, size, 0,
2422 gk20a_mem_flag_none); 2423 gk20a_mem_flag_none, true);
2423 if (!gpu_va) 2424 if (!gpu_va)
2424 goto clean_up; 2425 goto clean_up;
2425 g_bfr_va[GOLDEN_CTX_VA] = gpu_va; 2426 g_bfr_va[GOLDEN_CTX_VA] = gpu_va;
@@ -2429,7 +2430,7 @@ static int gr_gk20a_map_global_ctx_buffers(struct gk20a *g,
2429 sgt = gr->global_ctx_buffer[PRIV_ACCESS_MAP].mem.sgt; 2430 sgt = gr->global_ctx_buffer[PRIV_ACCESS_MAP].mem.sgt;
2430 size = gr->global_ctx_buffer[PRIV_ACCESS_MAP].mem.size; 2431 size = gr->global_ctx_buffer[PRIV_ACCESS_MAP].mem.size;
2431 gpu_va = gk20a_gmmu_map(ch_vm, &sgt, size, 0, 2432 gpu_va = gk20a_gmmu_map(ch_vm, &sgt, size, 0,
2432 gk20a_mem_flag_none); 2433 gk20a_mem_flag_none, true);
2433 if (!gpu_va) 2434 if (!gpu_va)
2434 goto clean_up; 2435 goto clean_up;
2435 g_bfr_va[PRIV_ACCESS_MAP_VA] = gpu_va; 2436 g_bfr_va[PRIV_ACCESS_MAP_VA] = gpu_va;
@@ -2501,7 +2502,7 @@ int gr_gk20a_alloc_gr_ctx(struct gk20a *g,
2501 2502
2502 gr_ctx->mem.gpu_va = gk20a_gmmu_map(vm, &gr_ctx->mem.sgt, gr_ctx->mem.size, 2503 gr_ctx->mem.gpu_va = gk20a_gmmu_map(vm, &gr_ctx->mem.sgt, gr_ctx->mem.size,
2503 NVGPU_MAP_BUFFER_FLAGS_CACHEABLE_TRUE, 2504 NVGPU_MAP_BUFFER_FLAGS_CACHEABLE_TRUE,
2504 gk20a_mem_flag_none); 2505 gk20a_mem_flag_none, true);
2505 if (!gr_ctx->mem.gpu_va) 2506 if (!gr_ctx->mem.gpu_va)
2506 goto err_free_mem; 2507 goto err_free_mem;
2507 2508