From 2998ab4e0a0b19da1332b82d779bd17b4e284b38 Mon Sep 17 00:00:00 2001 From: Deepak Nibade Date: Tue, 4 Sep 2018 16:37:33 +0530 Subject: gpu: nvgpu: remove unused regops HALs Below regops HALs are not being called from anywhere, so remove them gops.regops.get_runcontrol_whitelist_ranges() gops.regops.get_runcontrol_whitelist_ranges_count() gops.regops.get_qctl_whitelist_ranges() gops.regops.get_qctl_whitelist_ranges_count() HAL gops.regops.apply_smpc_war() is unimplemented for all the chips, and it was originally only needed for gk20a which is not unsupported So remove this HAL and its call too Jira NVGPU-620 Change-Id: Ia2c74883cd647a2e94ee740ffd040a40c442b939 Signed-off-by: Deepak Nibade Reviewed-on: https://git-master.nvidia.com/r/1813106 Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/gv100/hal_gv100.c | 8 ------- drivers/gpu/nvgpu/gv100/regops_gv100.c | 39 ---------------------------------- 2 files changed, 47 deletions(-) (limited to 'drivers/gpu/nvgpu/gv100') diff --git a/drivers/gpu/nvgpu/gv100/hal_gv100.c b/drivers/gpu/nvgpu/gv100/hal_gv100.c index 1bc5d091..9d90d1d4 100644 --- a/drivers/gpu/nvgpu/gv100/hal_gv100.c +++ b/drivers/gpu/nvgpu/gv100/hal_gv100.c @@ -790,16 +790,8 @@ static const struct gpu_ops gv100_ops = { .get_runcontrol_whitelist = gv100_get_runcontrol_whitelist, .get_runcontrol_whitelist_count = gv100_get_runcontrol_whitelist_count, - .get_runcontrol_whitelist_ranges = - gv100_get_runcontrol_whitelist_ranges, - .get_runcontrol_whitelist_ranges_count = - gv100_get_runcontrol_whitelist_ranges_count, .get_qctl_whitelist = gv100_get_qctl_whitelist, .get_qctl_whitelist_count = gv100_get_qctl_whitelist_count, - .get_qctl_whitelist_ranges = gv100_get_qctl_whitelist_ranges, - .get_qctl_whitelist_ranges_count = - gv100_get_qctl_whitelist_ranges_count, - .apply_smpc_war = gv100_apply_smpc_war, }, .mc = { .intr_mask = mc_gp10b_intr_mask, diff --git a/drivers/gpu/nvgpu/gv100/regops_gv100.c b/drivers/gpu/nvgpu/gv100/regops_gv100.c index c6ce6b94..baf57c78 100644 --- a/drivers/gpu/nvgpu/gv100/regops_gv100.c +++ b/drivers/gpu/nvgpu/gv100/regops_gv100.c @@ -23,7 +23,6 @@ */ #include "gk20a/gk20a.h" -#include "gk20a/dbg_gpu_gk20a.h" #include "gk20a/regops_gk20a.h" #include "regops_gv100.h" @@ -5626,19 +5625,12 @@ static const struct regop_offset_range gv100_global_whitelist_ranges[] = { static const u64 gv100_global_whitelist_ranges_count = ARRAY_SIZE(gv100_global_whitelist_ranges); -/* context */ - /* runcontrol */ static const u32 gv100_runcontrol_whitelist[] = { }; static const u64 gv100_runcontrol_whitelist_count = ARRAY_SIZE(gv100_runcontrol_whitelist); -static const struct regop_offset_range gv100_runcontrol_whitelist_ranges[] = { -}; -static const u64 gv100_runcontrol_whitelist_ranges_count = - ARRAY_SIZE(gv100_runcontrol_whitelist_ranges); - /* quad ctl */ static const u32 gv100_qctl_whitelist[] = { @@ -5646,11 +5638,6 @@ static const u32 gv100_qctl_whitelist[] = { static const u64 gv100_qctl_whitelist_count = ARRAY_SIZE(gv100_qctl_whitelist); -static const struct regop_offset_range gv100_qctl_whitelist_ranges[] = { -}; -static const u64 gv100_qctl_whitelist_ranges_count = - ARRAY_SIZE(gv100_qctl_whitelist_ranges); - const struct regop_offset_range *gv100_get_global_whitelist_ranges(void) { return gv100_global_whitelist_ranges; @@ -5681,16 +5668,6 @@ u64 gv100_get_runcontrol_whitelist_count(void) return gv100_runcontrol_whitelist_count; } -const struct regop_offset_range *gv100_get_runcontrol_whitelist_ranges(void) -{ - return gv100_runcontrol_whitelist_ranges; -} - -u64 gv100_get_runcontrol_whitelist_ranges_count(void) -{ - return gv100_runcontrol_whitelist_ranges_count; -} - const u32 *gv100_get_qctl_whitelist(void) { return gv100_qctl_whitelist; @@ -5700,19 +5677,3 @@ u64 gv100_get_qctl_whitelist_count(void) { return gv100_qctl_whitelist_count; } - -const struct regop_offset_range *gv100_get_qctl_whitelist_ranges(void) -{ - return gv100_qctl_whitelist_ranges; -} - -u64 gv100_get_qctl_whitelist_ranges_count(void) -{ - return gv100_qctl_whitelist_ranges_count; -} - -int gv100_apply_smpc_war(struct dbg_session_gk20a *dbg_s) -{ - /* Not needed on gv100 */ - return 0; -} -- cgit v1.2.2