From 9907b97985c47003a179c4357274b737cc0699ee Mon Sep 17 00:00:00 2001 From: Sunny He Date: Tue, 27 Jun 2017 15:09:05 -0700 Subject: gpu: nvgpu: Reorg ce2 HAL initialization Reorganize HAL initialization to remove inheritance and construct the gpu_ops struct at compile time. This patch only covers the ce2 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: I7dfd5e8dcd4d6f3623d1b795b6b2e15ff356a13a Signed-off-by: Sunny He Reviewed-on: https://git-master.nvidia.com/r/1509632 GVS: Gerrit_Virtual_Submit Reviewed-by: Terje Bergstrom --- drivers/gpu/nvgpu/gp10b/ce_gp10b.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'drivers/gpu/nvgpu/gp10b/ce_gp10b.c') diff --git a/drivers/gpu/nvgpu/gp10b/ce_gp10b.c b/drivers/gpu/nvgpu/gp10b/ce_gp10b.c index 1fff37fb..59a6ee21 100644 --- a/drivers/gpu/nvgpu/gp10b/ce_gp10b.c +++ b/drivers/gpu/nvgpu/gp10b/ce_gp10b.c @@ -54,7 +54,7 @@ void gp10b_ce_isr(struct gk20a *g, u32 inst_id, u32 pri_base) return; } -static int gp10b_ce_nonstall_isr(struct gk20a *g, u32 inst_id, u32 pri_base) +int gp10b_ce_nonstall_isr(struct gk20a *g, u32 inst_id, u32 pri_base) { int ops = 0; u32 ce_intr = gk20a_readl(g, ce_intr_status_r(inst_id)); @@ -70,8 +70,3 @@ static int gp10b_ce_nonstall_isr(struct gk20a *g, u32 inst_id, u32 pri_base) return ops; } -void gp10b_init_ce(struct gpu_ops *gops) -{ - gops->ce2.isr_stall = gp10b_ce_isr; - gops->ce2.isr_nonstall = gp10b_ce_nonstall_isr; -} -- cgit v1.2.2