mirror of
git://nv-tegra.nvidia.com/linux-nvgpu.git
synced 2025-12-24 10:34:43 +03:00
gpu: nvgpu: rename feature Make and C flags
Name the Make and C flag variables consistently wih syntax: CONFIG_NVGPU_<feature name> s/NVGPU_DEBUGGER/CONFIG_NVGPU_DEBUGGER s/NVGPU_CYCLESTATS/CONFIG_NVGPU_CYCLESTATS s/NVGPU_USERD/CONFIG_NVGPU_USERD s/NVGPU_CHANNEL_WDT/CONFIG_NVGPU_CHANNEL_WDT s/NVGPU_FEATURE_CE/CONFIG_NVGPU_CE s/NVGPU_GRAPHICS/CONFIG_NVGPU_GRAPHICS s/NVGPU_ENGINE/CONFIG_NVGPU_FIFO_ENGINE_ACTIVITY s/NVGPU_FEATURE_CHANNEL_TSG_SCHED/CONFIG_NVGPU_CHANNEL_TSG_SCHED s/NVGPU_FEATURE_CHANNEL_TSG_CONTROL/CONFIG_NVGPU_CHANNEL_TSG_CONTROL s/NVGPU_FEATURE_ENGINE_QUEUE/CONFIG_NVGPU_ENGINE_QUEUE s/GK20A_CTXSW_TRACE/CONFIG_NVGPU_FECS_TRACE s/IGPU_VIRT_SUPPORT/CONFIG_NVGPU_IGPU_VIRT s/CONFIG_TEGRA_NVLINK/CONFIG_NVGPU_NVLINK s/NVGPU_DGPU_SUPPORT/CONFIG_NVGPU_DGPU s/NVGPU_VPR/CONFIG_NVGPU_VPR s/NVGPU_REPLAYABLE_FAULT/CONFIG_NVGPU_REPLAYABLE_FAULT s/NVGPU_FEATURE_LS_PMU/CONFIG_NVGPU_LS_PMU s/NVGPU_FEATURE_POWER_PG/CONFIG_NVGPU_POWER_PG JIRA NVGPU-3624 Change-Id: I8b2492b085095fc6ee95926d8f8c3929702a1773 Signed-off-by: Sagar Kamble <skamble@nvidia.com> Reviewed-on: https://git-master.nvidia.com/r/2130290 Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com> Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
This commit is contained in:
committed by
mobile promotions
parent
cc3b0467db
commit
3f08cf8a48
@@ -48,7 +48,7 @@
|
||||
#include <nvgpu/gr/gr.h>
|
||||
|
||||
#include <trace/events/gk20a.h>
|
||||
#ifdef NVGPU_FEATURE_LS_PMU
|
||||
#ifdef CONFIG_NVGPU_LS_PMU
|
||||
#include <nvgpu/pmu/pmu_pstate.h>
|
||||
#endif
|
||||
|
||||
@@ -100,14 +100,14 @@ int gk20a_prepare_poweroff(struct gk20a *g)
|
||||
}
|
||||
}
|
||||
|
||||
#ifdef NVGPU_FEATURE_LS_PMU
|
||||
#ifdef CONFIG_NVGPU_LS_PMU
|
||||
/* disable elpg before gr or fifo suspend */
|
||||
if (g->support_ls_pmu) {
|
||||
ret = nvgpu_pmu_destroy(g, g->pmu);
|
||||
}
|
||||
#endif
|
||||
|
||||
#ifdef NVGPU_DGPU_SUPPORT
|
||||
#ifdef CONFIG_NVGPU_DGPU
|
||||
if (nvgpu_is_enabled(g, NVGPU_SUPPORT_SEC2_RTOS)) {
|
||||
tmp_ret = nvgpu_sec2_destroy(g);
|
||||
if ((tmp_ret != 0) && (ret == 0)) {
|
||||
@@ -134,11 +134,11 @@ int gk20a_prepare_poweroff(struct gk20a *g)
|
||||
nvgpu_falcon_sw_free(g, FALCON_ID_SEC2);
|
||||
nvgpu_falcon_sw_free(g, FALCON_ID_PMU);
|
||||
|
||||
#ifdef NVGPU_FEATURE_CE
|
||||
#ifdef CONFIG_NVGPU_CE
|
||||
nvgpu_ce_suspend(g);
|
||||
#endif
|
||||
|
||||
#ifdef NVGPU_DGPU_SUPPORT
|
||||
#ifdef CONFIG_NVGPU_DGPU
|
||||
/* deinit the bios */
|
||||
nvgpu_bios_sw_deinit(g, g->bios);
|
||||
#endif
|
||||
@@ -197,7 +197,7 @@ int gk20a_finalize_poweron(struct gk20a *g)
|
||||
goto exit;
|
||||
}
|
||||
|
||||
#ifdef NVGPU_DGPU_SUPPORT
|
||||
#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");
|
||||
@@ -208,7 +208,7 @@ int gk20a_finalize_poweron(struct gk20a *g)
|
||||
err = nvgpu_falcon_sw_init(g, FALCON_ID_NVDEC);
|
||||
if (err != 0) {
|
||||
nvgpu_err(g, "failed to sw init FALCON_ID_NVDEC");
|
||||
#ifdef NVGPU_DGPU_SUPPORT
|
||||
#ifdef CONFIG_NVGPU_DGPU
|
||||
goto done_sec2;
|
||||
#else
|
||||
goto done_pmu;
|
||||
@@ -231,7 +231,7 @@ int gk20a_finalize_poweron(struct gk20a *g)
|
||||
goto done;
|
||||
}
|
||||
|
||||
#ifdef NVGPU_DGPU_SUPPORT
|
||||
#ifdef CONFIG_NVGPU_DGPU
|
||||
if (nvgpu_is_enabled(g, NVGPU_SUPPORT_SEC2_RTOS)) {
|
||||
err = nvgpu_init_sec2_setup_sw(g, &g->sec2);
|
||||
if (err != 0) {
|
||||
@@ -249,7 +249,7 @@ int gk20a_finalize_poweron(struct gk20a *g)
|
||||
}
|
||||
}
|
||||
|
||||
#ifdef NVGPU_DGPU_SUPPORT
|
||||
#ifdef CONFIG_NVGPU_DGPU
|
||||
err = nvgpu_bios_sw_init(g, &g->bios);
|
||||
if (err != 0) {
|
||||
nvgpu_err(g, "BIOS SW init failed %d", err);
|
||||
@@ -350,7 +350,7 @@ int gk20a_finalize_poweron(struct gk20a *g)
|
||||
|
||||
nvgpu_mutex_acquire(&g->tpc_pg_lock);
|
||||
|
||||
#ifdef NVGPU_DEBUGGER
|
||||
#ifdef CONFIG_NVGPU_DEBUGGER
|
||||
if (g->can_tpc_powergate) {
|
||||
if (g->ops.gr.powergate_tpc != NULL) {
|
||||
g->ops.gr.powergate_tpc(g);
|
||||
@@ -382,7 +382,7 @@ int gk20a_finalize_poweron(struct gk20a *g)
|
||||
}
|
||||
}
|
||||
|
||||
#ifdef NVGPU_DGPU_SUPPORT
|
||||
#ifdef CONFIG_NVGPU_DGPU
|
||||
if (nvgpu_is_enabled(g, NVGPU_SUPPORT_SEC2_RTOS)) {
|
||||
err = nvgpu_init_sec2_support(g);
|
||||
if (err != 0) {
|
||||
@@ -393,7 +393,7 @@ int gk20a_finalize_poweron(struct gk20a *g)
|
||||
}
|
||||
#endif
|
||||
|
||||
#ifdef NVGPU_FEATURE_LS_PMU
|
||||
#ifdef CONFIG_NVGPU_LS_PMU
|
||||
err = nvgpu_pmu_init(g, g->pmu);
|
||||
if (err != 0) {
|
||||
nvgpu_err(g, "failed to init gk20a pmu");
|
||||
@@ -425,7 +425,7 @@ int gk20a_finalize_poweron(struct gk20a *g)
|
||||
|
||||
nvgpu_mutex_release(&g->tpc_pg_lock);
|
||||
|
||||
#ifdef NVGPU_FEATURE_LS_PMU
|
||||
#ifdef CONFIG_NVGPU_LS_PMU
|
||||
if (nvgpu_is_enabled(g, NVGPU_PMU_PSTATE)) {
|
||||
err = nvgpu_pmu_pstate_sw_setup(g);
|
||||
if (err != 0) {
|
||||
@@ -475,7 +475,7 @@ int gk20a_finalize_poweron(struct gk20a *g)
|
||||
/* Restore the debug setting */
|
||||
g->ops.fb.set_debug_mode(g, g->mmu_debug_ctrl);
|
||||
|
||||
#ifdef NVGPU_FEATURE_CE
|
||||
#ifdef CONFIG_NVGPU_CE
|
||||
err = nvgpu_ce_init_support(g);
|
||||
if (err != 0) {
|
||||
nvgpu_err(g, "failed to init ce");
|
||||
@@ -529,7 +529,7 @@ done_gsp:
|
||||
nvgpu_falcon_sw_free(g, FALCON_ID_GSPLITE);
|
||||
done_nvdec:
|
||||
nvgpu_falcon_sw_free(g, FALCON_ID_NVDEC);
|
||||
#ifdef NVGPU_DGPU_SUPPORT
|
||||
#ifdef CONFIG_NVGPU_DGPU
|
||||
done_sec2:
|
||||
nvgpu_falcon_sw_free(g, FALCON_ID_SEC2);
|
||||
#endif
|
||||
@@ -630,7 +630,7 @@ void gk20a_init_gpu_characteristics(struct gk20a *g)
|
||||
|
||||
g->ops.gr.init.detect_sm_arch(g);
|
||||
|
||||
#ifdef CONFIG_GK20A_CYCLE_STATS
|
||||
#ifdef CONFIG_NVGPU_CYCLESTATS
|
||||
if (g->ops.gr.init_cyclestats != NULL) {
|
||||
g->ops.gr.init_cyclestats(g);
|
||||
}
|
||||
@@ -652,7 +652,7 @@ static void gk20a_free_cb(struct nvgpu_ref *refcount)
|
||||
|
||||
nvgpu_log(g, gpu_dbg_shutdown, "Freeing GK20A struct!");
|
||||
|
||||
#ifdef NVGPU_FEATURE_CE
|
||||
#ifdef CONFIG_NVGPU_CE
|
||||
nvgpu_ce_destroy(g);
|
||||
#endif
|
||||
|
||||
|
||||
Reference in New Issue
Block a user