gpu: nvgpu: gp106: reserve wpr from allocator

In addition to nonwpr_base address, allocate also the wpr_base that is
configured as wpr, in order to not overlap user allocations on that
area.

Jira DNVGPU-18

Change-Id: Ie2976a091e8084fcdc8ffd9fb4b6c75411450acb
Signed-off-by: Konsta Holtta <kholtta@nvidia.com>
Reviewed-on: http://git-master/r/1182874
Reviewed-by: Deepak Nibade <dnibade@nvidia.com>
Reviewed-by: Automatic_Commit_Validation_User
GVS: Gerrit_Virtual_Submit
Reviewed-by: Mahantesh Kumbar <mkumbar@nvidia.com>
Reviewed-by: Alex Waterman <alexw@nvidia.com>
Reviewed-by: Vijayakumar Subbu <vsubbu@nvidia.com>

1 files changed, 10 insertions, 0 deletions

diff --git a/drivers/gpu/nvgpu/gp106/acr_gp106.c b/drivers/gpu/nvgpu/gp106/acr_gp106.c
index 9364afec..c43b0165 100644
--- a/drivers/gpu/nvgpu/gp106/acr_gp106.c
+++ b/drivers/gpu/nvgpu/gp106/acr_gp106.c
@@ -93,9 +93,19 @@ static int gp106_alloc_blob_space(struct gk20a *g,
                 size_t size, struct mem_desc *mem)
 {
         struct wpr_carveout_info wpr_inf;
+        int err;
 
         g->ops.pmu.get_wpr(g, &wpr_inf);
 
+        /*
+         * Even though this mem_desc wouldn't be used, the wpr region needs to
+         * be reserved in the allocator.
+         */
+        err = gk20a_gmmu_alloc_attr_vid_at(g, 0, wpr_inf.size,
+                                &g->acr.wpr_dummy, wpr_inf.wpr_base);
+        if (err)
+                return err;
+
         return gk20a_gmmu_alloc_attr_vid_at(g, 0, wpr_inf.size, mem,
                         wpr_inf.nonwpr_base);
 }