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/gm20b/hal_gm20b.c | 8 ------ drivers/gpu/nvgpu/gm20b/regops_gm20b.c | 46 ---------------------------------- 2 files changed, 54 deletions(-) (limited to 'drivers/gpu/nvgpu/gm20b') diff --git a/drivers/gpu/nvgpu/gm20b/hal_gm20b.c b/drivers/gpu/nvgpu/gm20b/hal_gm20b.c index 2f90512e..ca7081cf 100644 --- a/drivers/gpu/nvgpu/gm20b/hal_gm20b.c +++ b/drivers/gpu/nvgpu/gm20b/hal_gm20b.c @@ -574,16 +574,8 @@ static const struct gpu_ops gm20b_ops = { .get_runcontrol_whitelist = gm20b_get_runcontrol_whitelist, .get_runcontrol_whitelist_count = gm20b_get_runcontrol_whitelist_count, - .get_runcontrol_whitelist_ranges = - gm20b_get_runcontrol_whitelist_ranges, - .get_runcontrol_whitelist_ranges_count = - gm20b_get_runcontrol_whitelist_ranges_count, .get_qctl_whitelist = gm20b_get_qctl_whitelist, .get_qctl_whitelist_count = gm20b_get_qctl_whitelist_count, - .get_qctl_whitelist_ranges = gm20b_get_qctl_whitelist_ranges, - .get_qctl_whitelist_ranges_count = - gm20b_get_qctl_whitelist_ranges_count, - .apply_smpc_war = gm20b_apply_smpc_war, }, .mc = { .intr_mask = mc_gk20a_intr_mask, diff --git a/drivers/gpu/nvgpu/gm20b/regops_gm20b.c b/drivers/gpu/nvgpu/gm20b/regops_gm20b.c index e23a0a62..ab865b68 100644 --- a/drivers/gpu/nvgpu/gm20b/regops_gm20b.c +++ b/drivers/gpu/nvgpu/gm20b/regops_gm20b.c @@ -23,12 +23,9 @@ */ #include "gk20a/gk20a.h" -#include "gk20a/dbg_gpu_gk20a.h" #include "gk20a/regops_gk20a.h" #include "regops_gm20b.h" -#include - static const struct regop_offset_range gm20b_global_whitelist_ranges[] = { { 0x00001a00, 3 }, { 0x0000259c, 1 }, @@ -366,29 +363,12 @@ static const u32 gm20b_runcontrol_whitelist[] = { static const u64 gm20b_runcontrol_whitelist_count = ARRAY_SIZE(gm20b_runcontrol_whitelist); -static const struct regop_offset_range gm20b_runcontrol_whitelist_ranges[] = { - { 0x00419e10, 1 }, - { 0x0041c610, 1 }, - { 0x0041ce10, 1 }, - { 0x00501e10, 1 }, - { 0x00504610, 1 }, - { 0x00504e10, 1 }, -}; -static const u64 gm20b_runcontrol_whitelist_ranges_count = - ARRAY_SIZE(gm20b_runcontrol_whitelist_ranges); - - /* quad ctl */ static const u32 gm20b_qctl_whitelist[] = { }; static const u64 gm20b_qctl_whitelist_count = ARRAY_SIZE(gm20b_qctl_whitelist); -static const struct regop_offset_range gm20b_qctl_whitelist_ranges[] = { -}; -static const u64 gm20b_qctl_whitelist_ranges_count = - ARRAY_SIZE(gm20b_qctl_whitelist_ranges); - const struct regop_offset_range *gm20b_get_global_whitelist_ranges(void) { return gm20b_global_whitelist_ranges; @@ -419,16 +399,6 @@ u64 gm20b_get_runcontrol_whitelist_count(void) return gm20b_runcontrol_whitelist_count; } -const struct regop_offset_range *gm20b_get_runcontrol_whitelist_ranges(void) -{ - return gm20b_runcontrol_whitelist_ranges; -} - -u64 gm20b_get_runcontrol_whitelist_ranges_count(void) -{ - return gm20b_runcontrol_whitelist_ranges_count; -} - const u32 *gm20b_get_qctl_whitelist(void) { return gm20b_qctl_whitelist; @@ -438,19 +408,3 @@ u64 gm20b_get_qctl_whitelist_count(void) { return gm20b_qctl_whitelist_count; } - -const struct regop_offset_range *gm20b_get_qctl_whitelist_ranges(void) -{ - return gm20b_qctl_whitelist_ranges; -} - -u64 gm20b_get_qctl_whitelist_ranges_count(void) -{ - return gm20b_qctl_whitelist_ranges_count; -} - -int gm20b_apply_smpc_war(struct dbg_session_gk20a *dbg_s) -{ - /* Not needed on gm20b */ - return 0; -} -- cgit v1.2.2