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/gp106/hal_gp106.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'drivers/gpu/nvgpu/gp106/hal_gp106.c') diff --git a/drivers/gpu/nvgpu/gp106/hal_gp106.c b/drivers/gpu/nvgpu/gp106/hal_gp106.c index da1a44a9..69a797a6 100644 --- a/drivers/gpu/nvgpu/gp106/hal_gp106.c +++ b/drivers/gpu/nvgpu/gp106/hal_gp106.c @@ -81,7 +81,6 @@ #include "gp106/bios_gp106.h" #include "gp106/fifo_gp106.h" #include "gp106/clk_gp106.h" -#include "gp106/mm_gp106.h" #include "gp106/pmu_gp106.h" #include "gp106/gr_ctx_gp106.h" #include "gp106/gr_gp106.h" @@ -426,6 +425,7 @@ static const struct gpu_ops gp106_ops = { .set_debug_mode = gm20b_fb_set_debug_mode, .tlb_invalidate = gm20b_fb_tlb_invalidate, .mem_unlock = NULL, + .get_vidmem_size = gp106_fb_get_vidmem_size, }, .clock_gating = { .slcg_bus_load_gating_prod = @@ -598,7 +598,6 @@ static const struct gpu_ops gp106_ops = { .mmu_fault_pending = gk20a_fifo_mmu_fault_pending, .init_bar2_vm = gp10b_init_bar2_vm, .remove_bar2_vm = gp10b_remove_bar2_vm, - .get_vidmem_size = gp106_mm_get_vidmem_size, .get_kind_invalid = gm20b_get_kind_invalid, .get_kind_pitch = gm20b_get_kind_pitch, }, -- cgit v1.2.2