From db4a1713cbf2eb899c7539355c7e302d11cc3ff7 Mon Sep 17 00:00:00 2001 From: Richard Zhao Date: Thu, 5 May 2022 15:49:44 -0700 Subject: [PATCH] gpu: nvgpu: gr: move .load_sw_bundle64() out of CONFIG_NVGPU_DGPU .load_sw_bundle64 is also used by ga10b. Jira GVSCI-9976 Change-Id: Ife46dd5bf40a9e143cf119a64dd0d2adcb1ae81c Signed-off-by: Richard Zhao Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvgpu/+/2708393 Reviewed-by: svc-mobile-coverity Reviewed-by: svc-mobile-misra Reviewed-by: svc-mobile-cert Reviewed-by: Mahantesh Kumbar Reviewed-by: Alex Waterman GVS: Gerrit_Virtual_Submit --- drivers/gpu/nvgpu/common/gr/obj_ctx.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/drivers/gpu/nvgpu/common/gr/obj_ctx.c b/drivers/gpu/nvgpu/common/gr/obj_ctx.c index 7b6ba1614..094761ad7 100644 --- a/drivers/gpu/nvgpu/common/gr/obj_ctx.c +++ b/drivers/gpu/nvgpu/common/gr/obj_ctx.c @@ -427,10 +427,8 @@ static int nvgpu_gr_obj_ctx_alloc_sw_bundle(struct gk20a *g) nvgpu_netlist_get_sw_bundle_init_av_list(g); struct netlist_av_list *sw_veid_bundle_init = nvgpu_netlist_get_sw_veid_bundle_init_av_list(g); -#ifdef CONFIG_NVGPU_DGPU struct netlist_av64_list *sw_bundle64_init = nvgpu_netlist_get_sw_bundle64_init_av64_list(g); -#endif /* enable pipe mode override */ g->ops.gr.init.pipe_mode_override(g, true); @@ -449,14 +447,12 @@ static int nvgpu_gr_obj_ctx_alloc_sw_bundle(struct gk20a *g) } } -#ifdef CONFIG_NVGPU_DGPU if (g->ops.gr.init.load_sw_bundle64 != NULL) { err = g->ops.gr.init.load_sw_bundle64(g, sw_bundle64_init); if (err != 0) { goto error; } } -#endif /* disable pipe mode override */ g->ops.gr.init.pipe_mode_override(g, false);