diff --git a/arch/nvgpu-common.yaml b/arch/nvgpu-common.yaml index 5abc06031..4ef880f15 100644 --- a/arch/nvgpu-common.yaml +++ b/arch/nvgpu-common.yaml @@ -581,8 +581,7 @@ fbp: owner: Deepak N sources: [ common/fbp/fbp.c, common/fbp/fbp_priv.h, - include/nvgpu/fbp.h, - include/nvgpu/gops/fbp.h ] + include/nvgpu/fbp.h ] init: safe: yes diff --git a/drivers/gpu/nvgpu/common/init/nvgpu_init.c b/drivers/gpu/nvgpu/common/init/nvgpu_init.c index 535e25cee..af07361d7 100644 --- a/drivers/gpu/nvgpu/common/init/nvgpu_init.c +++ b/drivers/gpu/nvgpu/common/init/nvgpu_init.c @@ -51,6 +51,7 @@ #endif #include #include +#include #ifdef CONFIG_NVGPU_LS_PMU #include @@ -715,7 +716,7 @@ static int nvgpu_early_init(struct gk20a *g) NVGPU_INIT_TABLE_ENTRY(g->ops.fifo.reset_enable_hw, NO_FLAG), NVGPU_INIT_TABLE_ENTRY(&nvgpu_init_fb_support, NO_FLAG), NVGPU_INIT_TABLE_ENTRY(g->ops.ltc.init_ltc_support, NO_FLAG), - NVGPU_INIT_TABLE_ENTRY(g->ops.fbp.fbp_init_support, NO_FLAG), + NVGPU_INIT_TABLE_ENTRY(nvgpu_fbp_init_support, NO_FLAG), NVGPU_INIT_TABLE_ENTRY(g->ops.grmgr.init_gr_manager, NO_FLAG), }; diff --git a/drivers/gpu/nvgpu/hal/init/hal_ga100.c b/drivers/gpu/nvgpu/hal/init/hal_ga100.c index ddd689a9a..b481e43df 100644 --- a/drivers/gpu/nvgpu/hal/init/hal_ga100.c +++ b/drivers/gpu/nvgpu/hal/init/hal_ga100.c @@ -31,7 +31,6 @@ #ifdef CONFIG_NVGPU_LS_PMU #include #endif -#include #include #include #include @@ -1592,12 +1591,6 @@ static const struct gops_falcon ga100_ops_falcon = { }; #endif -#ifdef CONFIG_NVGPU_LS_PMU -static const struct gops_fbp ga100_ops_fbp = { - .fbp_init_support = nvgpu_fbp_init_support, -}; -#endif - #ifdef CONFIG_NVGPU_LS_PMU static const struct gops_priv_ring ga100_ops_priv_ring = { .enable_priv_ring = gm20b_priv_ring_enable, @@ -1807,7 +1800,6 @@ int ga100_init_hal(struct gk20a *g) #endif gops->xve = ga100_ops_xve; gops->falcon = ga100_ops_falcon; - gops->fbp = ga100_ops_fbp; gops->priv_ring = ga100_ops_priv_ring; gops->fuse = ga100_ops_fuse; #if defined(CONFIG_NVGPU_NVLINK) diff --git a/drivers/gpu/nvgpu/hal/init/hal_ga10b.c b/drivers/gpu/nvgpu/hal/init/hal_ga10b.c index 9b4d73795..b01bef164 100644 --- a/drivers/gpu/nvgpu/hal/init/hal_ga10b.c +++ b/drivers/gpu/nvgpu/hal/init/hal_ga10b.c @@ -32,7 +32,6 @@ #ifdef CONFIG_NVGPU_LS_PMU #include #endif -#include #include #include #include @@ -1570,10 +1569,6 @@ static const struct gops_falcon ga10b_ops_falcon = { #endif }; -static const struct gops_fbp ga10b_ops_fbp = { - .fbp_init_support = nvgpu_fbp_init_support, -}; - static const struct gops_priv_ring ga10b_ops_priv_ring = { .enable_priv_ring = gm20b_priv_ring_enable, .isr = gp10b_priv_ring_isr, @@ -1746,7 +1741,6 @@ int ga10b_init_hal(struct gk20a *g) #endif gops->falcon = ga10b_ops_falcon; gops->gsp = ga10b_ops_gsp; - gops->fbp = ga10b_ops_fbp; gops->priv_ring = ga10b_ops_priv_ring; gops->fuse = ga10b_ops_fuse; gops->top = ga10b_ops_top; diff --git a/drivers/gpu/nvgpu/hal/init/hal_gm20b.c b/drivers/gpu/nvgpu/hal/init/hal_gm20b.c index 3bfaa0540..b1d01436f 100644 --- a/drivers/gpu/nvgpu/hal/init/hal_gm20b.c +++ b/drivers/gpu/nvgpu/hal/init/hal_gm20b.c @@ -53,7 +53,6 @@ #ifdef CONFIG_NVGPU_LS_PMU #include #endif -#include #include #include #include @@ -1013,10 +1012,6 @@ static const struct gops_falcon gm20b_ops_falcon = { #endif }; -static const struct gops_fbp gm20b_ops_fbp = { - .fbp_init_support = nvgpu_fbp_init_support, -}; - static const struct gops_priv_ring gm20b_ops_priv_ring = { .enable_priv_ring = gm20b_priv_ring_enable, .isr = gm20b_priv_ring_isr, @@ -1180,7 +1175,6 @@ int gm20b_init_hal(struct gk20a *g) gops->css = gm20b_ops_css; #endif gops->falcon = gm20b_ops_falcon; - gops->fbp = gm20b_ops_fbp; gops->priv_ring = gm20b_ops_priv_ring; gops->fuse = gm20b_ops_fuse; gops->top = gm20b_ops_top; diff --git a/drivers/gpu/nvgpu/hal/init/hal_gp10b.c b/drivers/gpu/nvgpu/hal/init/hal_gp10b.c index 80047a516..9d77f58bb 100644 --- a/drivers/gpu/nvgpu/hal/init/hal_gp10b.c +++ b/drivers/gpu/nvgpu/hal/init/hal_gp10b.c @@ -53,7 +53,6 @@ #ifdef CONFIG_NVGPU_LS_PMU #include #endif -#include #include #include #include @@ -1107,10 +1106,6 @@ static const struct gops_falcon gp10b_ops_falcon = { #endif }; -static const struct gops_fbp gp10b_ops_fbp = { - .fbp_init_support = nvgpu_fbp_init_support, -}; - static const struct gops_priv_ring gp10b_ops_priv_ring = { .enable_priv_ring = gm20b_priv_ring_enable, .isr = gp10b_priv_ring_isr, @@ -1270,7 +1265,6 @@ int gp10b_init_hal(struct gk20a *g) gops->css = gp10b_ops_css; #endif gops->falcon = gp10b_ops_falcon; - gops->fbp = gp10b_ops_fbp; gops->priv_ring = gp10b_ops_priv_ring; gops->fuse = gp10b_ops_fuse; gops->top = gp10b_ops_top; diff --git a/drivers/gpu/nvgpu/hal/init/hal_gv11b.c b/drivers/gpu/nvgpu/hal/init/hal_gv11b.c index 360a2e4cb..a2c62627b 100644 --- a/drivers/gpu/nvgpu/hal/init/hal_gv11b.c +++ b/drivers/gpu/nvgpu/hal/init/hal_gv11b.c @@ -30,7 +30,6 @@ #ifdef CONFIG_NVGPU_LS_PMU #include #endif -#include #include #include #include @@ -1385,10 +1384,6 @@ static const struct gops_falcon gv11b_ops_falcon = { #endif }; -static const struct gops_fbp gv11b_ops_fbp = { - .fbp_init_support = nvgpu_fbp_init_support, -}; - static const struct gops_priv_ring gv11b_ops_priv_ring = { .enable_priv_ring = gm20b_priv_ring_enable, .isr = gp10b_priv_ring_isr, @@ -1553,7 +1548,6 @@ int gv11b_init_hal(struct gk20a *g) gops->css = gv11b_ops_css; #endif gops->falcon = gv11b_ops_falcon; - gops->fbp = gv11b_ops_fbp; gops->priv_ring = gv11b_ops_priv_ring; gops->fuse = gv11b_ops_fuse; gops->top = gv11b_ops_top; diff --git a/drivers/gpu/nvgpu/hal/init/hal_tu104.c b/drivers/gpu/nvgpu/hal/init/hal_tu104.c index 012c7f224..c515b1ae3 100644 --- a/drivers/gpu/nvgpu/hal/init/hal_tu104.c +++ b/drivers/gpu/nvgpu/hal/init/hal_tu104.c @@ -220,7 +220,6 @@ #ifdef CONFIG_NVGPU_LS_PMU #include #endif -#include #include #include #include @@ -1483,12 +1482,6 @@ static const struct gops_falcon tu104_ops_falcon = { }; #endif -#ifdef CONFIG_NVGPU_LS_PMU -static const struct gops_fbp tu104_ops_fbp = { - .fbp_init_support = nvgpu_fbp_init_support, -}; -#endif - #ifdef CONFIG_NVGPU_LS_PMU static const struct gops_priv_ring tu104_ops_priv_ring = { .enable_priv_ring = gm20b_priv_ring_enable, @@ -1736,7 +1729,6 @@ int tu104_init_hal(struct gk20a *g) #endif gops->xve = tu104_ops_xve; gops->falcon = tu104_ops_falcon; - gops->fbp = tu104_ops_fbp; gops->priv_ring = tu104_ops_priv_ring; gops->fuse = tu104_ops_fuse; #if defined(CONFIG_NVGPU_NVLINK) diff --git a/drivers/gpu/nvgpu/hal/vgpu/init/vgpu_hal_ga10b.c b/drivers/gpu/nvgpu/hal/vgpu/init/vgpu_hal_ga10b.c index 82d8e55d2..33df3d5d1 100644 --- a/drivers/gpu/nvgpu/hal/vgpu/init/vgpu_hal_ga10b.c +++ b/drivers/gpu/nvgpu/hal/vgpu/init/vgpu_hal_ga10b.c @@ -126,7 +126,6 @@ #ifdef CONFIG_NVGPU_LS_PMU #include #endif -#include #include #include #include @@ -1013,10 +1012,6 @@ static const struct gops_falcon vgpu_ga10b_ops_falcon = { .falcon_sw_free = nvgpu_falcon_sw_free, }; -static const struct gops_fbp vgpu_ga10b_ops_fbp = { - .fbp_init_support = nvgpu_fbp_init_support, -}; - static const struct gops_priv_ring vgpu_ga10b_ops_priv_ring = { .enable_priv_ring = NULL, .isr = NULL, @@ -1147,7 +1142,6 @@ int vgpu_ga10b_init_hal(struct gk20a *g) gops->css = vgpu_ga10b_ops_css; #endif gops->falcon = vgpu_ga10b_ops_falcon; - gops->fbp = vgpu_ga10b_ops_fbp; gops->priv_ring = vgpu_ga10b_ops_priv_ring; gops->fuse = vgpu_ga10b_ops_fuse; gops->top = vgpu_ga10b_ops_top; diff --git a/drivers/gpu/nvgpu/hal/vgpu/init/vgpu_hal_gv11b.c b/drivers/gpu/nvgpu/hal/vgpu/init/vgpu_hal_gv11b.c index 695a57ef1..53fe528f3 100644 --- a/drivers/gpu/nvgpu/hal/vgpu/init/vgpu_hal_gv11b.c +++ b/drivers/gpu/nvgpu/hal/vgpu/init/vgpu_hal_gv11b.c @@ -110,7 +110,6 @@ #ifdef CONFIG_NVGPU_LS_PMU #include #endif -#include #include #include #include @@ -982,10 +981,6 @@ static const struct gops_falcon vgpu_gv11b_ops_falcon = { .falcon_sw_free = nvgpu_falcon_sw_free, }; -static const struct gops_fbp vgpu_gv11b_ops_fbp = { - .fbp_init_support = nvgpu_fbp_init_support, -}; - static const struct gops_priv_ring vgpu_gv11b_ops_priv_ring = { .enable_priv_ring = NULL, .isr = NULL, @@ -1110,7 +1105,6 @@ int vgpu_gv11b_init_hal(struct gk20a *g) gops->css = vgpu_gv11b_ops_css; #endif gops->falcon = vgpu_gv11b_ops_falcon; - gops->fbp = vgpu_gv11b_ops_fbp; gops->priv_ring = vgpu_gv11b_ops_priv_ring; gops->fuse = vgpu_gv11b_ops_fuse; gops->top = vgpu_gv11b_ops_top; diff --git a/drivers/gpu/nvgpu/include/nvgpu/gops/fbp.h b/drivers/gpu/nvgpu/include/nvgpu/gops/fbp.h deleted file mode 100644 index 61ea85f2b..000000000 --- a/drivers/gpu/nvgpu/include/nvgpu/gops/fbp.h +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Copyright (c) 2020-2021, NVIDIA CORPORATION. All rights reserved. - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - * DEALINGS IN THE SOFTWARE. - */ -#ifndef NVGPU_GOPS_FBP_H -#define NVGPU_GOPS_FBP_H - -/** - * @brief fbp gops. - * - * The structure contains function pointers to fbp initialization. The details - * of this callback is described in the assigned function to this func pointer. - */ -struct gops_fbp { - /** Read and initialize FBP configuration information. */ - int (*fbp_init_support)(struct gk20a *g); -}; - -#endif /* NVGPU_GOPS_FBP_H */ diff --git a/drivers/gpu/nvgpu/include/nvgpu/gpu_ops.h b/drivers/gpu/nvgpu/include/nvgpu/gpu_ops.h index 1c2ce3e46..2b3e22764 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/gpu_ops.h +++ b/drivers/gpu/nvgpu/include/nvgpu/gpu_ops.h @@ -30,7 +30,6 @@ #include #include #include -#include #include #include #include @@ -187,8 +186,6 @@ struct gpu_ops { #endif /** Falcon hal ops. */ struct gops_falcon falcon; - /** Fbp hal ops. */ - struct gops_fbp fbp; /** Priv ring hal ops. */ struct gops_priv_ring priv_ring; /** Top hal ops. */ diff --git a/userspace/units/init/nvgpu-init.c b/userspace/units/init/nvgpu-init.c index 9c98f3115..5a067904d 100644 --- a/userspace/units/init/nvgpu-init.c +++ b/userspace/units/init/nvgpu-init.c @@ -403,7 +403,6 @@ static void set_poweron_funcs_success(struct gk20a *g) setup_simple_init_func_success(&g->ops.mm.init_mm_support, i++); setup_simple_init_func_success(&g->ops.fifo.fifo_init_support, i++); setup_simple_init_func_success(&g->ops.therm.elcg_init_idle_filters, i++); - setup_simple_init_func_success(&g->ops.fbp.fbp_init_support, i++); setup_simple_init_func_success(&g->ops.gr.gr_init_support, i++); setup_simple_init_func_success(&g->ops.ecc.ecc_finalize_support, i++); setup_simple_init_func_success(&g->ops.therm.init_therm_support, i++);