gpu: nvgpu: Use preallocated VPR buffer

To prevent deadlock while allocating VPR in nvgpu, allocate all the
needed VPR memory at probe time and use an internal allocator to
hand out space for VPR buffers.

Change-Id: I584b9a0f746d5d1dec021cdfbd6f26b4b92e4412
Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1655324
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>

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)
         if (err)
                 goto clean_up;
 
-        if (g->ops.secure_alloc)
-                g->ops.secure_alloc(g,
+        if (g->ops.secure_alloc) {
+                err = g->ops.secure_alloc(g,
                                        &gr->global_ctx_buffer[CIRCULAR_VPR],
                                        cb_buffer_size);
+                if (err)
+                        goto clean_up;
+        }
 
         gk20a_dbg_info("pagepool_buffer_size : %d", pagepool_buffer_size);
 
@@ -2544,10 +2547,13 @@ static int gr_gk20a_alloc_global_ctx_buffers(struct gk20a *g)
         if (err)
                 goto clean_up;
 
-        if (g->ops.secure_alloc)
-                g->ops.secure_alloc(g,
+        if (g->ops.secure_alloc) {
+                err = g->ops.secure_alloc(g,
                                        &gr->global_ctx_buffer[PAGEPOOL_VPR],
                                        pagepool_buffer_size);
+                if (err)
+                        goto clean_up;
+        }
 
         gk20a_dbg_info("attr_buffer_size : %d", attr_buffer_size);
 
@@ -2556,10 +2562,13 @@ static int gr_gk20a_alloc_global_ctx_buffers(struct gk20a *g)
         if (err)
                 goto clean_up;
 
-        if (g->ops.secure_alloc)
-                g->ops.secure_alloc(g,
+        if (g->ops.secure_alloc) {
+                err = g->ops.secure_alloc(g,
                                        &gr->global_ctx_buffer[ATTRIBUTE_VPR],
                                        attr_buffer_size);
+                if (err)
+                        goto clean_up;
+        }
 
         gk20a_dbg_info("golden_image_size : %d",
                    gr->ctx_vars.golden_image_size);