From c22ff250979ef1d7e552a08088e62c7499be055b Mon Sep 17 00:00:00 2001 From: shashank singh Date: Fri, 26 Nov 2021 11:05:51 +0530 Subject: [PATCH] gpu: nvgpu: move GSPLITE outside DGPU flag Jira NVGPU-7276 Change-Id: Ic69443f66f42ab5e981ce865c24fcca63f783a76 Signed-off-by: shashank singh Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvgpu/+/2632687 Tested-by: mobile promotions Reviewed-by: mobile promotions --- drivers/gpu/nvgpu/common/init/nvgpu_init.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/nvgpu/common/init/nvgpu_init.c b/drivers/gpu/nvgpu/common/init/nvgpu_init.c index f7d698abd..7ca1c48fb 100644 --- a/drivers/gpu/nvgpu/common/init/nvgpu_init.c +++ b/drivers/gpu/nvgpu/common/init/nvgpu_init.c @@ -258,23 +258,23 @@ static int nvgpu_falcons_sw_init(struct gk20a *g) goto done_sec2; } +#endif err = g->ops.falcon.falcon_sw_init(g, FALCON_ID_GSPLITE); if (err != 0) { nvgpu_err(g, "failed to sw init FALCON_ID_GSPLITE"); goto done_nvdec; } -#endif return 0; -#ifdef CONFIG_NVGPU_DGPU done_nvdec: +#ifdef CONFIG_NVGPU_DGPU g->ops.falcon.falcon_sw_free(g, FALCON_ID_NVDEC); done_sec2: g->ops.falcon.falcon_sw_free(g, FALCON_ID_SEC2); done_fecs: - g->ops.falcon.falcon_sw_free(g, FALCON_ID_FECS); #endif + g->ops.falcon.falcon_sw_free(g, FALCON_ID_FECS); done_pmu: g->ops.falcon.falcon_sw_free(g, FALCON_ID_PMU);