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 <rizhao@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvgpu/+/2708393
Reviewed-by: svc-mobile-coverity <svc-mobile-coverity@nvidia.com>
Reviewed-by: svc-mobile-misra <svc-mobile-misra@nvidia.com>
Reviewed-by: svc-mobile-cert <svc-mobile-cert@nvidia.com>
Reviewed-by: Mahantesh Kumbar <mkumbar@nvidia.com>
Reviewed-by: Alex Waterman <alexw@nvidia.com>
GVS: Gerrit_Virtual_Submit
This commit is contained in:
Richard Zhao
2022-05-05 15:49:44 -07:00
committed by mobile promotions
parent d603838110
commit db4a1713cb

View File

@@ -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);