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>

3 files changed, 1 insertions, 18 deletions

diff --git a/drivers/gpu/nvgpu/gv100/hal_gv100.c b/drivers/gpu/nvgpu/gv100/hal_gv100.c
index 589f6adf..4af237b0 100644
--- a/drivers/gpu/nvgpu/gv100/hal_gv100.c
+++ b/drivers/gpu/nvgpu/gv100/hal_gv100.c
@@ -510,6 +510,7 @@ static const struct gpu_ops gv100_ops = {
                 .is_fault_buf_enabled = gv11b_fb_is_fault_buf_enabled,
                 .fault_buf_set_state_hw = gv11b_fb_fault_buf_set_state_hw,
                 .fault_buf_configure_hw = gv11b_fb_fault_buf_configure_hw,
+                .get_vidmem_size = gv100_fb_get_vidmem_size,
         },
         .clock_gating = {
                 .slcg_bus_load_gating_prod =
@@ -685,7 +686,6 @@ static const struct gpu_ops gv100_ops = {
                 .get_default_big_page_size = gp10b_mm_get_default_big_page_size,
                 .gpu_phys_addr = gv11b_gpu_phys_addr,
                 .get_mmu_levels = gp10b_mm_get_mmu_levels,
-                .get_vidmem_size = gv100_mm_get_vidmem_size,
                 .init_pdb = gp10b_mm_init_pdb,
                 .init_mm_setup_hw = gv11b_init_mm_setup_hw,
                 .is_bar1_supported = gv11b_mm_is_bar1_supported,
diff --git a/drivers/gpu/nvgpu/gv100/mm_gv100.c b/drivers/gpu/nvgpu/gv100/mm_gv100.c
index 38b876bf..77a0ac4d 100644
--- a/drivers/gpu/nvgpu/gv100/mm_gv100.c
+++ b/drivers/gpu/nvgpu/gv100/mm_gv100.c
@@ -28,22 +28,6 @@
 #include "gk20a/gk20a.h"
 #include "gv100/mm_gv100.h"
 
-#include <nvgpu/hw/gv100/hw_fb_gv100.h>
-
-size_t gv100_mm_get_vidmem_size(struct gk20a *g)
-{
-        u32 range = gk20a_readl(g, fb_mmu_local_memory_range_r());
-        u32 mag = fb_mmu_local_memory_range_lower_mag_v(range);
-        u32 scale = fb_mmu_local_memory_range_lower_scale_v(range);
-        u32 ecc = fb_mmu_local_memory_range_ecc_mode_v(range);
-        size_t bytes = ((size_t)mag << scale) * SZ_1M;
-
-        if (ecc)
-                bytes = bytes / 16 * 15;
-
-        return bytes;
-}
-
 u32 gv100_mm_get_flush_retries(struct gk20a *g, enum nvgpu_flush_op op)
 {
         switch (op) {
diff --git a/drivers/gpu/nvgpu/gv100/mm_gv100.h b/drivers/gpu/nvgpu/gv100/mm_gv100.h
index ea896503..535e868c 100644
--- a/drivers/gpu/nvgpu/gv100/mm_gv100.h
+++ b/drivers/gpu/nvgpu/gv100/mm_gv100.h
@@ -27,7 +27,6 @@
 
 struct gk20a;
 
-size_t gv100_mm_get_vidmem_size(struct gk20a *g);
 u32 gv100_mm_get_flush_retries(struct gk20a *g, enum nvgpu_flush_op op);
 
 #endif