From a15e110a9b790f55a5c6e257cfbf7f7235f5a334 Mon Sep 17 00:00:00 2001 From: Sunny He Date: Fri, 28 Jul 2017 18:36:52 -0700 Subject: gpu: nvgpu: Reorg regops HAL initialization Reorganize HAL initialization to remove inheritance and construct the gpu_ops struct at compile time. This patch only covers the regops 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: I7e2ccf158a8e7efa453a3326e86146660f18926f Signed-off-by: Sunny He Reviewed-on: https://git-master.nvidia.com/r/1530135 Reviewed-by: Automatic_Commit_Validation_User GVS: Gerrit_Virtual_Submit Reviewed-by: Alex Waterman Tested-by: Alex Waterman Reviewed-by: Terje Bergstrom --- drivers/gpu/nvgpu/gp106/hal_gp106.c | 25 ++++++++++++- drivers/gpu/nvgpu/gp106/regops_gp106.c | 65 ++++++++-------------------------- drivers/gpu/nvgpu/gp106/regops_gp106.h | 16 +++++++-- 3 files changed, 52 insertions(+), 54 deletions(-) (limited to 'drivers/gpu/nvgpu/gp106') diff --git a/drivers/gpu/nvgpu/gp106/hal_gp106.c b/drivers/gpu/nvgpu/gp106/hal_gp106.c index 8077c5e1..0caf890f 100644 --- a/drivers/gpu/nvgpu/gp106/hal_gp106.c +++ b/drivers/gpu/nvgpu/gp106/hal_gp106.c @@ -353,6 +353,29 @@ static const struct gpu_ops gp106_ops = { .get_internal_sensor_limits = gp106_get_internal_sensor_limits, .configure_therm_alert = gp106_configure_therm_alert, }, + .regops = { + .get_global_whitelist_ranges = + gp106_get_global_whitelist_ranges, + .get_global_whitelist_ranges_count = + gp106_get_global_whitelist_ranges_count, + .get_context_whitelist_ranges = + gp106_get_context_whitelist_ranges, + .get_context_whitelist_ranges_count = + gp106_get_context_whitelist_ranges_count, + .get_runcontrol_whitelist = gp106_get_runcontrol_whitelist, + .get_runcontrol_whitelist_count = + gp106_get_runcontrol_whitelist_count, + .get_runcontrol_whitelist_ranges = + gp106_get_runcontrol_whitelist_ranges, + .get_runcontrol_whitelist_ranges_count = + gp106_get_runcontrol_whitelist_ranges_count, + .get_qctl_whitelist = gp106_get_qctl_whitelist, + .get_qctl_whitelist_count = gp106_get_qctl_whitelist_count, + .get_qctl_whitelist_ranges = gp106_get_qctl_whitelist_ranges, + .get_qctl_whitelist_ranges_count = + gp106_get_qctl_whitelist_ranges_count, + .apply_smpc_war = gp106_apply_smpc_war, + }, .mc = { .intr_enable = mc_gp10b_intr_enable, .intr_unit_config = mc_gp10b_intr_unit_config, @@ -447,6 +470,7 @@ int gp106_init_hal(struct gk20a *g) gops->fecs_trace = gp106_ops.fecs_trace; gops->pramin = gp106_ops.pramin; gops->therm = gp106_ops.therm; + gops->regops = gp106_ops.regops; gops->mc = gp106_ops.mc; gops->debug = gp106_ops.debug; gops->dbg_session_ops = gp106_ops.dbg_session_ops; @@ -477,7 +501,6 @@ int gp106_init_hal(struct gk20a *g) gp106_init_pmu_ops(g); gp106_init_clk_ops(gops); gp106_init_clk_arb_ops(gops); - gp106_init_regops(gops); g->name = "gp10x"; diff --git a/drivers/gpu/nvgpu/gp106/regops_gp106.c b/drivers/gpu/nvgpu/gp106/regops_gp106.c index a165c426..f734ef49 100644 --- a/drivers/gpu/nvgpu/gp106/regops_gp106.c +++ b/drivers/gpu/nvgpu/gp106/regops_gp106.c @@ -1,7 +1,7 @@ /* * Tegra GP106 GPU Debugger Driver Register Ops * - * 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, @@ -1708,105 +1708,68 @@ static const struct regop_offset_range gp106_qctl_whitelist_ranges[] = { static const u32 gp106_qctl_whitelist_ranges_count = ARRAY_SIZE(gp106_qctl_whitelist_ranges); -static const struct regop_offset_range *gp106_get_global_whitelist_ranges(void) +const struct regop_offset_range *gp106_get_global_whitelist_ranges(void) { return gp106_global_whitelist_ranges; } -static int gp106_get_global_whitelist_ranges_count(void) +int gp106_get_global_whitelist_ranges_count(void) { return gp106_global_whitelist_ranges_count; } -static const struct regop_offset_range *gp106_get_context_whitelist_ranges(void) +const struct regop_offset_range *gp106_get_context_whitelist_ranges(void) { return gp106_global_whitelist_ranges; } -static int gp106_get_context_whitelist_ranges_count(void) +int gp106_get_context_whitelist_ranges_count(void) { return gp106_global_whitelist_ranges_count; } -static const u32 *gp106_get_runcontrol_whitelist(void) +const u32 *gp106_get_runcontrol_whitelist(void) { return gp106_runcontrol_whitelist; } -static int gp106_get_runcontrol_whitelist_count(void) +int gp106_get_runcontrol_whitelist_count(void) { return gp106_runcontrol_whitelist_count; } -static const -struct regop_offset_range *gp106_get_runcontrol_whitelist_ranges(void) +const struct regop_offset_range *gp106_get_runcontrol_whitelist_ranges(void) { return gp106_runcontrol_whitelist_ranges; } -static int gp106_get_runcontrol_whitelist_ranges_count(void) +int gp106_get_runcontrol_whitelist_ranges_count(void) { return gp106_runcontrol_whitelist_ranges_count; } -static const u32 *gp106_get_qctl_whitelist(void) +const u32 *gp106_get_qctl_whitelist(void) { return gp106_qctl_whitelist; } -static int gp106_get_qctl_whitelist_count(void) +int gp106_get_qctl_whitelist_count(void) { return gp106_qctl_whitelist_count; } -static const struct regop_offset_range *gp106_get_qctl_whitelist_ranges(void) +const struct regop_offset_range *gp106_get_qctl_whitelist_ranges(void) { return gp106_qctl_whitelist_ranges; } -static int gp106_get_qctl_whitelist_ranges_count(void) +int gp106_get_qctl_whitelist_ranges_count(void) { return gp106_qctl_whitelist_ranges_count; } -static int gp106_apply_smpc_war(struct dbg_session_gk20a *dbg_s) +int gp106_apply_smpc_war(struct dbg_session_gk20a *dbg_s) { /* Not needed on gp106 */ return 0; } - -void gp106_init_regops(struct gpu_ops *gops) -{ - gops->regops.get_global_whitelist_ranges = - gp106_get_global_whitelist_ranges; - gops->regops.get_global_whitelist_ranges_count = - gp106_get_global_whitelist_ranges_count; - - gops->regops.get_context_whitelist_ranges = - gp106_get_context_whitelist_ranges; - gops->regops.get_context_whitelist_ranges_count = - gp106_get_context_whitelist_ranges_count; - - gops->regops.get_runcontrol_whitelist = - gp106_get_runcontrol_whitelist; - gops->regops.get_runcontrol_whitelist_count = - gp106_get_runcontrol_whitelist_count; - - gops->regops.get_runcontrol_whitelist_ranges = - gp106_get_runcontrol_whitelist_ranges; - gops->regops.get_runcontrol_whitelist_ranges_count = - gp106_get_runcontrol_whitelist_ranges_count; - - gops->regops.get_qctl_whitelist = - gp106_get_qctl_whitelist; - gops->regops.get_qctl_whitelist_count = - gp106_get_qctl_whitelist_count; - - gops->regops.get_qctl_whitelist_ranges = - gp106_get_qctl_whitelist_ranges; - gops->regops.get_qctl_whitelist_ranges_count = - gp106_get_qctl_whitelist_ranges_count; - - gops->regops.apply_smpc_war = - gp106_apply_smpc_war; -} diff --git a/drivers/gpu/nvgpu/gp106/regops_gp106.h b/drivers/gpu/nvgpu/gp106/regops_gp106.h index 7f6b6861..271adcbf 100644 --- a/drivers/gpu/nvgpu/gp106/regops_gp106.h +++ b/drivers/gpu/nvgpu/gp106/regops_gp106.h @@ -2,7 +2,7 @@ * * Tegra GP106 GPU Debugger Driver Register Ops * - * 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,6 +19,18 @@ #ifndef __REGOPS_GP106_H_ #define __REGOPS_GP106_H_ -void gp106_init_regops(struct gpu_ops *gops); +const struct regop_offset_range *gp106_get_global_whitelist_ranges(void); +int gp106_get_global_whitelist_ranges_count(void); +const struct regop_offset_range *gp106_get_context_whitelist_ranges(void); +int gp106_get_context_whitelist_ranges_count(void); +const u32 *gp106_get_runcontrol_whitelist(void); +int gp106_get_runcontrol_whitelist_count(void); +const struct regop_offset_range *gp106_get_runcontrol_whitelist_ranges(void); +int gp106_get_runcontrol_whitelist_ranges_count(void); +const u32 *gp106_get_qctl_whitelist(void); +int gp106_get_qctl_whitelist_count(void); +const struct regop_offset_range *gp106_get_qctl_whitelist_ranges(void); +int gp106_get_qctl_whitelist_ranges_count(void); +int gp106_apply_smpc_war(struct dbg_session_gk20a *dbg_s); #endif /* __REGOPS_GP106_H_ */ -- cgit v1.2.2