summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu/common/mm
diff options
context:
space:
mode:
authorTerje Bergstrom <tbergstrom@nvidia.com>2018-08-16 18:00:07 -0400
committermobile promotions <svcmobile_promotions@nvidia.com>2018-09-10 18:23:08 -0400
commit83efad7adb44647d37d98a57cbb6df48e356917d (patch)
treeeebbe2f831484d2e6ea90d027f0dc16d69f42114 /drivers/gpu/nvgpu/common/mm
parenta02e1c1f0b012b743d4c1ba9c853057b4359107e (diff)
gpu: nvgpu: Move FB size query to FB
Vidmem size query was in mm_xxx.c. It involves reading a register from FB, so move the query to FB HAL. JIRA NVGPU-1063 Change-Id: I30dfd2c4fdcdd6c841f85aaab7431d52473759bd Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com> Reviewed-on: https://git-master.nvidia.com/r/1801425 Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com> Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/common/mm')
-rw-r--r--drivers/gpu/nvgpu/common/mm/vidmem.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/nvgpu/common/mm/vidmem.c b/drivers/gpu/nvgpu/common/mm/vidmem.c
index 1ace2333..3f5e0fbb 100644
--- a/drivers/gpu/nvgpu/common/mm/vidmem.c
+++ b/drivers/gpu/nvgpu/common/mm/vidmem.c
@@ -41,7 +41,7 @@ void nvgpu_vidmem_destroy(struct gk20a *g)
41{ 41{
42 struct nvgpu_timeout timeout; 42 struct nvgpu_timeout timeout;
43 43
44 if (!g->ops.mm.get_vidmem_size) 44 if (!g->ops.fb.get_vidmem_size)
45 return; 45 return;
46 46
47 nvgpu_timeout_init(g, &timeout, 100, NVGPU_TIMER_RETRY_TIMER); 47 nvgpu_timeout_init(g, &timeout, 100, NVGPU_TIMER_RETRY_TIMER);
@@ -293,8 +293,8 @@ int nvgpu_vidmem_init(struct mm_gk20a *mm)
293 static struct nvgpu_alloc_carveout bootstrap_co = 293 static struct nvgpu_alloc_carveout bootstrap_co =
294 NVGPU_CARVEOUT("bootstrap-region", 0, 0); 294 NVGPU_CARVEOUT("bootstrap-region", 0, 0);
295 295
296 size = g->ops.mm.get_vidmem_size ? 296 size = g->ops.fb.get_vidmem_size ?
297 g->ops.mm.get_vidmem_size(g) : 0; 297 g->ops.fb.get_vidmem_size(g) : 0;
298 if (!size) 298 if (!size)
299 return 0; 299 return 0;
300 300