gpu: nvgpu: compile out changes for dgpu falcons

SW handling of dgpu falcons GSPLITE, NVDEC, SEC2, MINION needs to be
compiled out in the igpu safety build. Also compile out gp106 falcon
and nvdec sources.

JIRA NVGPU-3539

Change-Id: If4d21cec151b6c00f944457dc6cae4f457043b04
Signed-off-by: Sagar Kamble <skamble@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/2137226
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
This commit is contained in:
Sagar Kamble
2019-06-17 12:45:01 +05:30
committed by mobile promotions
parent 203120deed
commit b7061a3263
7 changed files with 37 additions and 24 deletions

View File

@@ -128,11 +128,14 @@ int gk20a_prepare_poweroff(struct gk20a *g)
ret = tmp_ret;
}
nvgpu_falcon_sw_free(g, FALCON_ID_PMU);
nvgpu_falcon_sw_free(g, FALCON_ID_FECS);
#ifdef CONFIG_NVGPU_DGPU
nvgpu_falcon_sw_free(g, FALCON_ID_GSPLITE);
nvgpu_falcon_sw_free(g, FALCON_ID_NVDEC);
nvgpu_falcon_sw_free(g, FALCON_ID_SEC2);
nvgpu_falcon_sw_free(g, FALCON_ID_PMU);
#endif
#ifdef CONFIG_NVGPU_CE
nvgpu_ce_suspend(g);
@@ -197,33 +200,31 @@ int gk20a_finalize_poweron(struct gk20a *g)
goto exit;
}
err = nvgpu_falcon_sw_init(g, FALCON_ID_FECS);
if (err != 0) {
nvgpu_err(g, "failed to sw init FALCON_ID_FECS");
goto done_pmu;
}
#ifdef CONFIG_NVGPU_DGPU
err = nvgpu_falcon_sw_init(g, FALCON_ID_SEC2);
if (err != 0) {
nvgpu_err(g, "failed to sw init FALCON_ID_SEC2");
goto done_pmu;
goto done_fecs;
}
#endif
err = nvgpu_falcon_sw_init(g, FALCON_ID_NVDEC);
if (err != 0) {
nvgpu_err(g, "failed to sw init FALCON_ID_NVDEC");
#ifdef CONFIG_NVGPU_DGPU
goto done_sec2;
#else
goto done_pmu;
#endif
}
err = nvgpu_falcon_sw_init(g, FALCON_ID_GSPLITE);
if (err != 0) {
nvgpu_err(g, "failed to sw init FALCON_ID_GSPLITE");
goto done_nvdec;
}
err = nvgpu_falcon_sw_init(g, FALCON_ID_FECS);
if (err != 0) {
nvgpu_err(g, "failed to sw init FALCON_ID_FECS");
goto done_gsp;
}
#endif
err = nvgpu_pmu_early_init(g, &g->pmu);
if (err != 0) {
@@ -528,15 +529,15 @@ int gk20a_finalize_poweron(struct gk20a *g)
goto exit;
done:
nvgpu_falcon_sw_free(g, FALCON_ID_FECS);
done_gsp:
#ifdef CONFIG_NVGPU_DGPU
nvgpu_falcon_sw_free(g, FALCON_ID_GSPLITE);
done_nvdec:
nvgpu_falcon_sw_free(g, FALCON_ID_NVDEC);
#ifdef CONFIG_NVGPU_DGPU
done_sec2:
nvgpu_falcon_sw_free(g, FALCON_ID_SEC2);
done_fecs:
#endif
nvgpu_falcon_sw_free(g, FALCON_ID_FECS);
done_pmu:
nvgpu_falcon_sw_free(g, FALCON_ID_PMU);
exit: