gpu: nvgpu: move all instance blocks to vidmem

Use gk20a_gmmu_alloc() in gk20a_alloc_inst_block() so that
we always try to allocate all inst blocks in vidmem first

Also use common API gk20a_alloc_inst_block() in
channel_gk20a_alloc_inst() as well

Jira DNVGPU-22

Change-Id: I6c47c19aae1189d7e57f47a51d21a32e2df53c1f
Signed-off-by: Deepak Nibade <dnibade@nvidia.com>
Reviewed-on: http://git-master/r/1216140
(cherry picked from commit 6c84961a50eb8a8b080b2db08f87e58143f5a6e8)
Reviewed-on: http://git-master/r/1219704
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>

2 files changed, 2 insertions, 2 deletions

diff --git a/drivers/gpu/nvgpu/gk20a/channel_gk20a.c b/drivers/gpu/nvgpu/gk20a/channel_gk20a.c
index 9f0b3e92..73de900d 100644
--- a/drivers/gpu/nvgpu/gk20a/channel_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/channel_gk20a.c
@@ -388,7 +388,7 @@ int channel_gk20a_alloc_inst(struct gk20a *g, struct channel_gk20a *ch)
 
         gk20a_dbg_fn("");
 
-        err = gk20a_gmmu_alloc(g, ram_in_alloc_size_v(), &ch->inst_block);
+        err = gk20a_alloc_inst_block(g, &ch->inst_block);
         if (err)
                 return err;
 
diff --git a/drivers/gpu/nvgpu/gk20a/mm_gk20a.c b/drivers/gpu/nvgpu/gk20a/mm_gk20a.c
index 70bdbc04..555353e2 100644
--- a/drivers/gpu/nvgpu/gk20a/mm_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/mm_gk20a.c
@@ -4668,7 +4668,7 @@ int gk20a_alloc_inst_block(struct gk20a *g, struct mem_desc *inst_block)
 
         gk20a_dbg_fn("");
 
-        err = gk20a_gmmu_alloc_sys(g, ram_in_alloc_size_v(), inst_block);
+        err = gk20a_gmmu_alloc(g, ram_in_alloc_size_v(), inst_block);
         if (err) {
                 gk20a_err(dev, "%s: memory allocation failed\n", __func__);
                 return err;