nv-tegra-mirror/linux-nvgpu
1
0
Fork 0
mirror of git://nv-tegra.nvidia.com/linux-nvgpu.git synced 2025-12-24 10:34:43 +03:00
Code Issues Packages Projects Releases Wiki Activity

gpu: nvgpu: do sm id programming early

Browse Source 
Move sm id programming before loading ctxsw and gpccs firmwares. This
is the actual sequence expected by ctxsw ucode. Legacy chips will use
the same old sequence.

Bug 200631350

Change-Id: I3cc1384982b238475af47da6a25e2acd6616fd84
Signed-off-by: Shashank Singh <shashsingh@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvgpu/+/2398300
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
This commit is contained in:
Shashank Singh
2020-08-13 06:37:54 +00:00
committed by Alex Waterman
parent e8201d6ce3
commit cdc96f900f
2 changed files with 26 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
drivers/gpu/nvgpu/common/gr/gr.c
View File

@@ -513,11 +513,6 @@ static int gr_init_setup_sw(struct gk20a *g)
goto clean_up;
}
err = gr_init_config(g, gr);
if (err != 0) {
goto clean_up;
}
#ifdef CONFIG_NVGPU_DEBUGGER
err = nvgpu_gr_hwpm_map_init(g, &g->gr->hwpm_map,
nvgpu_gr_falcon_get_pm_ctxsw_image_size(g->gr->falcon));
@@ -778,6 +773,27 @@ int nvgpu_gr_init_support(struct gk20a *g)
g->gr->initialized = false;
/* This is prerequisite for calling sm_id_config_early hal. */
if (!g->gr->sw_ready) {
err = gr_init_config(g, g->gr);
if (err != 0) {
return err;
}
}
#if defined(CONFIG_NVGPU_NEXT)
/*
* Move sm id programming before loading ctxsw and gpccs firmwares. This
* is the actual sequence expected by ctxsw ucode.
*/
if (g->ops.gr.init.sm_id_config_early != NULL) {
err = g->ops.gr.init.sm_id_config_early(g, g->gr->config);
if (err != 0) {
return err;
}
}
#endif
err = nvgpu_gr_falcon_init_ctxsw(g, g->gr->falcon);
if (err != 0) {
gr_intr_report_ctxsw_error(g, GPU_FECS_CTXSW_INIT_ERROR, 0, 0);

5
drivers/gpu/nvgpu/include/nvgpu/gr/fs_state.h
View File

@@ -51,5 +51,10 @@ struct nvgpu_gr_config;
* structure.
*/
int nvgpu_gr_fs_state_init(struct gk20a *g, struct nvgpu_gr_config *config);
/** @cond DOXYGEN_SHOULD_SKIP_THIS */
#if defined(CONFIG_NVGPU_NEXT)
#include "include/nvgpu/gr/nvgpu_next_fs_state.h"
#endif
/** @endcond DOXYGEN_SHOULD_SKIP_THIS */
#endif /* NVGPU_GR_FS_STATE_H */