summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu/gm206
diff options
context:
space:
mode:
authorDeepak Nibade <dnibade@nvidia.com>2016-08-23 04:47:05 -0400
committermobile promotions <svcmobile_promotions@nvidia.com>2016-09-01 12:11:46 -0400
commit93a436f581ced27efe2e600bb16b2e50b5696c12 (patch)
tree6112625ba14f2adc00fba8ab7b9065ed053b1d4e /drivers/gpu/nvgpu/gm206
parent8de995d4af1916a47a50b0b13965058c9873f962 (diff)
gpu: nvgpu: allocate blob space early
Allocting blob space for pmu might need fixed address allocation in vidmem and during boot up But if some page tables are allocated before blob space, blob space allocation could fail Fix this by allocating blob space early during boot up Jira DNVGPU-20 Change-Id: I30eca1023c8f8f8be101bb7e160ba57a7040911a Signed-off-by: Deepak Nibade <dnibade@nvidia.com> Reviewed-on: http://git-master/r/1206402 (cherry picked from commit fad4309ce345ed3879f497bda27f2eceb1084dbb) Reviewed-on: http://git-master/r/1210956 Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com> Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/gm206')
-rw-r--r--drivers/gpu/nvgpu/gm206/acr_gm206.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/nvgpu/gm206/acr_gm206.c b/drivers/gpu/nvgpu/gm206/acr_gm206.c
index 988761f0..39b30ea6 100644
--- a/drivers/gpu/nvgpu/gm206/acr_gm206.c
+++ b/drivers/gpu/nvgpu/gm206/acr_gm206.c
@@ -58,6 +58,9 @@ int gm206_alloc_blob_space(struct gk20a *g,
58{ 58{
59 struct wpr_carveout_info wpr_inf; 59 struct wpr_carveout_info wpr_inf;
60 60
61 if (mem->size)
62 return 0;
63
61 g->ops.pmu.get_wpr(g, &wpr_inf); 64 g->ops.pmu.get_wpr(g, &wpr_inf);
62 65
63 return gk20a_gmmu_alloc_attr_vid_at(g, 0, wpr_inf.size, mem, 66 return gk20a_gmmu_alloc_attr_vid_at(g, 0, wpr_inf.size, mem,