From 83efad7adb44647d37d98a57cbb6df48e356917d Mon Sep 17 00:00:00 2001 From: Terje Bergstrom Date: Thu, 16 Aug 2018 15:00:07 -0700 Subject: 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 Reviewed-on: https://git-master.nvidia.com/r/1801425 Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/common/mm/vidmem.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'drivers/gpu/nvgpu/common/mm') 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) { struct nvgpu_timeout timeout; - if (!g->ops.mm.get_vidmem_size) + if (!g->ops.fb.get_vidmem_size) return; nvgpu_timeout_init(g, &timeout, 100, NVGPU_TIMER_RETRY_TIMER); @@ -293,8 +293,8 @@ int nvgpu_vidmem_init(struct mm_gk20a *mm) static struct nvgpu_alloc_carveout bootstrap_co = NVGPU_CARVEOUT("bootstrap-region", 0, 0); - size = g->ops.mm.get_vidmem_size ? - g->ops.mm.get_vidmem_size(g) : 0; + size = g->ops.fb.get_vidmem_size ? + g->ops.fb.get_vidmem_size(g) : 0; if (!size) return 0; -- cgit v1.2.2