From e78153ea1b6b610f2307b86fc42ea33d678b250f Mon Sep 17 00:00:00 2001 From: Sunny He Date: Tue, 27 Jun 2017 13:42:33 -0700 Subject: gpu: nvgpu: Reorg mc HAL initialization Reorganize HAL initialization to remove inheritance and construct the gpu_ops struct at compile time. This patch only covers the mc 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: I26d74c14661a193af7e8d90dd672b73010e5f841 Signed-off-by: Sunny He Reviewed-on: https://git-master.nvidia.com/r/1509601 GVS: Gerrit_Virtual_Submit Reviewed-by: Richard Zhao Reviewed-by: Alex Waterman Reviewed-by: Vijayakumar Subbu --- drivers/gpu/nvgpu/gp10b/mc_gp10b.c | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) (limited to 'drivers/gpu/nvgpu/gp10b/mc_gp10b.c') diff --git a/drivers/gpu/nvgpu/gp10b/mc_gp10b.c b/drivers/gpu/nvgpu/gp10b/mc_gp10b.c index 39ad8f9b..5a1d5dcc 100644 --- a/drivers/gpu/nvgpu/gp10b/mc_gp10b.c +++ b/drivers/gpu/nvgpu/gp10b/mc_gp10b.c @@ -156,7 +156,7 @@ void mc_gp10b_intr_nonstall_resume(struct gk20a *g) g->ops.mc.intr_mask_restore[NVGPU_MC_INTR_NONSTALLING]); } -static bool mc_gp10b_is_intr1_pending(struct gk20a *g, +bool mc_gp10b_is_intr1_pending(struct gk20a *g, enum nvgpu_unit unit, u32 mc_intr_1) { u32 mask = 0; @@ -179,21 +179,3 @@ static bool mc_gp10b_is_intr1_pending(struct gk20a *g, return is_pending; } - -void gp10b_init_mc(struct gpu_ops *gops) -{ - gops->mc.intr_enable = mc_gp10b_intr_enable; - gops->mc.intr_unit_config = mc_gp10b_intr_unit_config; - gops->mc.isr_stall = mc_gp10b_isr_stall; - gops->mc.intr_stall = mc_gp10b_intr_stall; - gops->mc.intr_stall_pause = mc_gp10b_intr_stall_pause; - gops->mc.intr_stall_resume = mc_gp10b_intr_stall_resume; - gops->mc.intr_nonstall = mc_gp10b_intr_nonstall; - gops->mc.intr_nonstall_pause = mc_gp10b_intr_nonstall_pause; - gops->mc.intr_nonstall_resume = mc_gp10b_intr_nonstall_resume; - gops->mc.enable = gk20a_mc_enable; - gops->mc.disable = gk20a_mc_disable; - gops->mc.reset = gk20a_mc_reset; - gops->mc.boot_0 = gk20a_mc_boot_0; - gops->mc.is_intr1_pending = mc_gp10b_is_intr1_pending; -} -- cgit v1.2.2