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, 81 deletions

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,
         },
diff --git a/drivers/gpu/nvgpu/gp106/mm_gp106.c b/drivers/gpu/nvgpu/gp106/mm_gp106.c
deleted file mode 100644
index 7864880f..00000000
--- a/drivers/gpu/nvgpu/gp106/mm_gp106.c
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * GP106 memory management
- *
- * Copyright (c) 2016-2018, NVIDIA CORPORATION.  All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- */
-
-#include <nvgpu/sizes.h>
-#include <nvgpu/io.h>
-
-#include "gk20a/gk20a.h"
-#include "gp10b/mm_gp10b.h"
-#include "gp106/mm_gp106.h"
-
-#include <nvgpu/hw/gp106/hw_fb_gp106.h>
-
-size_t gp106_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;
-}
diff --git a/drivers/gpu/nvgpu/gp106/mm_gp106.h b/drivers/gpu/nvgpu/gp106/mm_gp106.h
deleted file mode 100644
index e9eb2014..00000000
--- a/drivers/gpu/nvgpu/gp106/mm_gp106.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * GP106 memory management
- *
- * Copyright (c) 2016-2017, NVIDIA CORPORATION.  All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef MM_GP106_H
-#define MM_GP106_H
-
-struct gk20a;
-
-size_t gp106_mm_get_vidmem_size(struct gk20a *g);
-
-#endif