diff options
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a/gr_gk20a.c')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/gr_gk20a.c | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c index fb02bb81..0e21f749 100644 --- a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c | |||
@@ -2532,10 +2532,13 @@ static int gr_gk20a_alloc_global_ctx_buffers(struct gk20a *g) | |||
2532 | if (err) | 2532 | if (err) |
2533 | goto clean_up; | 2533 | goto clean_up; |
2534 | 2534 | ||
2535 | if (g->ops.secure_alloc) | 2535 | if (g->ops.secure_alloc) { |
2536 | g->ops.secure_alloc(g, | 2536 | err = g->ops.secure_alloc(g, |
2537 | &gr->global_ctx_buffer[CIRCULAR_VPR], | 2537 | &gr->global_ctx_buffer[CIRCULAR_VPR], |
2538 | cb_buffer_size); | 2538 | cb_buffer_size); |
2539 | if (err) | ||
2540 | goto clean_up; | ||
2541 | } | ||
2539 | 2542 | ||
2540 | gk20a_dbg_info("pagepool_buffer_size : %d", pagepool_buffer_size); | 2543 | gk20a_dbg_info("pagepool_buffer_size : %d", pagepool_buffer_size); |
2541 | 2544 | ||
@@ -2544,10 +2547,13 @@ static int gr_gk20a_alloc_global_ctx_buffers(struct gk20a *g) | |||
2544 | if (err) | 2547 | if (err) |
2545 | goto clean_up; | 2548 | goto clean_up; |
2546 | 2549 | ||
2547 | if (g->ops.secure_alloc) | 2550 | if (g->ops.secure_alloc) { |
2548 | g->ops.secure_alloc(g, | 2551 | err = g->ops.secure_alloc(g, |
2549 | &gr->global_ctx_buffer[PAGEPOOL_VPR], | 2552 | &gr->global_ctx_buffer[PAGEPOOL_VPR], |
2550 | pagepool_buffer_size); | 2553 | pagepool_buffer_size); |
2554 | if (err) | ||
2555 | goto clean_up; | ||
2556 | } | ||
2551 | 2557 | ||
2552 | gk20a_dbg_info("attr_buffer_size : %d", attr_buffer_size); | 2558 | gk20a_dbg_info("attr_buffer_size : %d", attr_buffer_size); |
2553 | 2559 | ||
@@ -2556,10 +2562,13 @@ static int gr_gk20a_alloc_global_ctx_buffers(struct gk20a *g) | |||
2556 | if (err) | 2562 | if (err) |
2557 | goto clean_up; | 2563 | goto clean_up; |
2558 | 2564 | ||
2559 | if (g->ops.secure_alloc) | 2565 | if (g->ops.secure_alloc) { |
2560 | g->ops.secure_alloc(g, | 2566 | err = g->ops.secure_alloc(g, |
2561 | &gr->global_ctx_buffer[ATTRIBUTE_VPR], | 2567 | &gr->global_ctx_buffer[ATTRIBUTE_VPR], |
2562 | attr_buffer_size); | 2568 | attr_buffer_size); |
2569 | if (err) | ||
2570 | goto clean_up; | ||
2571 | } | ||
2563 | 2572 | ||
2564 | gk20a_dbg_info("golden_image_size : %d", | 2573 | gk20a_dbg_info("golden_image_size : %d", |
2565 | gr->ctx_vars.golden_image_size); | 2574 | gr->ctx_vars.golden_image_size); |