From 8d63cd3995d4a650b478ad69d7e29ed2b1b2d927 Mon Sep 17 00:00:00 2001 From: Sunny He Date: Mon, 31 Jul 2017 18:54:38 -0700 Subject: gpu: nvgpu: Reorg mm HAL initialization Reorganize HAL initialization to remove inheritance and construct the gpu_ops struct at compile time. This patch only covers the mm sub-module of the gpu_ops struct. Perform HAL function assignments in hal_gxxxx.c through the population of a chip-specific copy of gpu_ops. Jira NVGPU-74 Change-Id: I289284e6e528fc7951c959c8765ccf9349eec33b Signed-off-by: Sunny He Reviewed-on: https://git-master.nvidia.com/r/1533351 Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/gp106/mm_gp106.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'drivers/gpu/nvgpu/gp106/mm_gp106.c') diff --git a/drivers/gpu/nvgpu/gp106/mm_gp106.c b/drivers/gpu/nvgpu/gp106/mm_gp106.c index b7d7e8b8..82c58e97 100644 --- a/drivers/gpu/nvgpu/gp106/mm_gp106.c +++ b/drivers/gpu/nvgpu/gp106/mm_gp106.c @@ -1,7 +1,7 @@ /* * GP106 memory management * - * Copyright (c) 2016, NVIDIA CORPORATION. All rights reserved. + * Copyright (c) 2016-2017, NVIDIA CORPORATION. All rights reserved. * * This program is free software; you can redistribute it and/or modify it * under the terms and conditions of the GNU General Public License, @@ -19,7 +19,7 @@ #include -static size_t gp106_mm_get_vidmem_size(struct gk20a *g) +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); @@ -32,10 +32,3 @@ static size_t gp106_mm_get_vidmem_size(struct gk20a *g) return bytes; } - -void gp106_init_mm(struct gpu_ops *gops) -{ - gp10b_init_mm(gops); - gops->mm.get_vidmem_size = gp106_mm_get_vidmem_size; - gops->mm.get_physical_addr_bits = NULL; -} -- cgit v1.2.2