From 2f6be2735ee40e2696435eac32489d148c3dd0b8 Mon Sep 17 00:00:00 2001 From: Seshendra Gadagottu Date: Thu, 26 Mar 2020 05:50:21 -0700 Subject: [PATCH] gpu: nvgpu: remove nvgpu-next gr init nvgpu-next gr init is handled within nvgpu-next hals. So remove references to NVGPU_NEXT_INIT_GR_INFO from nvgpu hals. JIRA NVGPU-4979 Signed-off-by: Seshendra Gadagottu Change-Id: I2e493220f855a7ff2f940cf07b1fc0b876601df5 Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvgpu/+/2319102 Reviewed-by: automaticguardword Reviewed-by: svc-mobile-coverity Reviewed-by: svc-mobile-misra Reviewed-by: svc-mobile-cert Reviewed-by: Seema Khowala Reviewed-by: Vinod Gopalakrishnakurup Reviewed-by: Antony Clince Alex Reviewed-by: Lakshmanan M Reviewed-by: Vijayakumar Subbu Reviewed-by: mobile promotions Tested-by: mobile promotions GVS: Gerrit_Virtual_Submit --- drivers/gpu/nvgpu/common/fifo/engines.c | 7 ------- drivers/gpu/nvgpu/hal/fifo/engines_gp10b_fusa.c | 7 ------- 2 files changed, 14 deletions(-) diff --git a/drivers/gpu/nvgpu/common/fifo/engines.c b/drivers/gpu/nvgpu/common/fifo/engines.c index ecc01ed6f..4fbf79281 100644 --- a/drivers/gpu/nvgpu/common/fifo/engines.c +++ b/drivers/gpu/nvgpu/common/fifo/engines.c @@ -44,10 +44,6 @@ #include #include -#if defined(CONFIG_NVGPU_HAL_NON_FUSA) && defined(CONFIG_NVGPU_NEXT) -#include "nvgpu_next_gpuid.h" -#endif - #define FECS_METHOD_WFI_RESTORE 0x80000U enum nvgpu_fifo_engine nvgpu_engine_enum_from_type(struct gk20a *g, @@ -849,9 +845,6 @@ int nvgpu_engine_init_info(struct nvgpu_fifo *f) info->pri_base = dev_info.pri_base; info->engine_enum = engine_enum; info->fault_id = dev_info.fault_id; -#if defined(CONFIG_NVGPU_NON_FUSA) && defined(CONFIG_NVGPU_NEXT) - NVGPU_NEXT_INIT_GR_INFO(g, info, &dev_info); -#endif /* engine_id starts from 0 to NV_HOST_NUM_ENGINES */ f->active_engines_list[f->num_engines] = dev_info.engine_id; diff --git a/drivers/gpu/nvgpu/hal/fifo/engines_gp10b_fusa.c b/drivers/gpu/nvgpu/hal/fifo/engines_gp10b_fusa.c index 5bcf2e42b..93adc1828 100644 --- a/drivers/gpu/nvgpu/hal/fifo/engines_gp10b_fusa.c +++ b/drivers/gpu/nvgpu/hal/fifo/engines_gp10b_fusa.c @@ -31,10 +31,6 @@ #include "engines_gp10b.h" -#if defined(CONFIG_NVGPU_HAL_NON_FUSA) && defined(CONFIG_NVGPU_NEXT) -#include "nvgpu_next_gpuid.h" -#endif - int gp10b_engine_init_ce_info(struct nvgpu_fifo *f) { struct gk20a *g = f->g; @@ -109,9 +105,6 @@ int gp10b_engine_init_ce_info(struct nvgpu_fifo *f) info->inst_id = dev_info.inst_id; info->pri_base = dev_info.pri_base; info->engine_id = dev_info.engine_id; -#if defined(CONFIG_NVGPU_NON_FUSA) && defined(CONFIG_NVGPU_NEXT) - NVGPU_NEXT_INIT_GR_INFO(g, info, &dev_info); -#endif /* engine_id starts from 0 to NV_HOST_NUM_ENGINES */ f->active_engines_list[f->num_engines] =