From 858a204362a385f076b057b6196fd89f7edb839b Mon Sep 17 00:00:00 2001 From: Sunny He Date: Fri, 30 Jun 2017 10:31:31 -0700 Subject: gpu: nvgpu: Reorg cde HAL initialization Reorganize HAL initialization to remove inheritance and construct the gpu_ops struct at compile time. This patch only covers the cde 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: I9343ce4985eb941a2610f5f11e8f01269ab68481 Signed-off-by: Sunny He Reviewed-on: https://git-master/r/1511673 Reviewed-by: Automatic_Commit_Validation_User GVS: Gerrit_Virtual_Submit Reviewed-by: Alex Waterman Reviewed-by: Terje Bergstrom --- drivers/gpu/nvgpu/gm20b/hal_gm20b.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'drivers/gpu/nvgpu/gm20b/hal_gm20b.c') diff --git a/drivers/gpu/nvgpu/gm20b/hal_gm20b.c b/drivers/gpu/nvgpu/gm20b/hal_gm20b.c index 4d2e56d5..b16289f9 100644 --- a/drivers/gpu/nvgpu/gm20b/hal_gm20b.c +++ b/drivers/gpu/nvgpu/gm20b/hal_gm20b.c @@ -199,6 +199,9 @@ static const struct gpu_ops gm20b_ops = { .pg_gr_load_gating_prod = gr_gm20b_pg_gr_load_gating_prod, }, + .cde = { + .get_program_numbers = gm20b_cde_get_program_numbers + }, .chip_init_gpu_characteristics = gk20a_init_gpu_characteristics, .get_litter_value = gm20b_get_litter_value, }; @@ -211,6 +214,7 @@ int gm20b_init_hal(struct gk20a *g) gops->ltc = gm20b_ops.ltc; gops->clock_gating = gm20b_ops.clock_gating; + gops->cde = gm20b_ops.cde; /* Lone functions */ gops->chip_init_gpu_characteristics = @@ -261,7 +265,6 @@ int gm20b_init_hal(struct gk20a *g) gm20b_init_regops(gops); gk20a_init_debug_ops(gops); gk20a_init_dbg_session_ops(gops); - gm20b_init_cde_ops(gops); gm20b_init_therm_ops(gops); gk20a_init_tsg_ops(gops); #if defined(CONFIG_GK20A_CYCLE_STATS) -- cgit v1.2.2