nv-tegra-mirror/linux-nvgpu
1
0
Fork 0
mirror of git://nv-tegra.nvidia.com/linux-nvgpu.git synced 2025-12-22 17:36:20 +03:00
Code Issues Packages Projects Releases Wiki Activity

gpu: nvgpu: move FECS trace initialization call to linux

Browse Source 
gk20a_ctxsw_trace_init() is defined in linux specific code, but it is
right now being called from common functions gk20a_finalize_poweron()
and vgpu_finalize_poweron_common() in common code

Move this call to linux specific common function
nvgpu_finalize_poweron_linux() instead

Jira NVGPU-1880

Change-Id: I2548683f1a0378194ff5dd84c94936ccf0f9d17b
Signed-off-by: Deepak Nibade <dnibade@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/2069474
Reviewed-by: svc-misra-checker <svc-misra-checker@nvidia.com>
GVS: Gerrit_Virtual_Submit
Reviewed-by: Debarshi Dutta <ddutta@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
This commit is contained in:
Deepak Nibade
2019-03-07 15:52:49 +05:30
committed by mobile promotions
parent b6febf2fdc
commit 2f5e5596d3
3 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/gpu/nvgpu/common/init/nvgpu_init.c
View File

@@ -33,7 +33,6 @@
#include <nvgpu/ltc.h> #include <nvgpu/ltc.h>
#include <nvgpu/vidmem.h> #include <nvgpu/vidmem.h>
#include <nvgpu/mm.h> #include <nvgpu/mm.h>
#include <nvgpu/ctxsw_trace.h>
#include <nvgpu/soc.h> #include <nvgpu/soc.h>
#include <nvgpu/clk_arb.h> #include <nvgpu/clk_arb.h>
#include <nvgpu/therm.h> #include <nvgpu/therm.h>
@@ -376,12 +375,6 @@ int gk20a_finalize_poweron(struct gk20a *g)
g->ops.chip_init_gpu_characteristics(g); g->ops.chip_init_gpu_characteristics(g);
#ifdef CONFIG_GK20A_CTXSW_TRACE
err = gk20a_ctxsw_trace_init(g);
if (err != 0)
nvgpu_warn(g, "could not initialize ctxsw tracing");
#endif
/* Restore the debug setting */ /* Restore the debug setting */
g->ops.fb.set_debug_mode(g, g->mmu_debug_ctrl); g->ops.fb.set_debug_mode(g, g->mmu_debug_ctrl);

3
drivers/gpu/nvgpu/common/vgpu/vgpu.c
View File

@@ -456,9 +456,6 @@ int vgpu_finalize_poweron_common(struct gk20a *g)
g->ops.chip_init_gpu_characteristics(g); g->ops.chip_init_gpu_characteristics(g);
#ifdef CONFIG_GK20A_CTXSW_TRACE
gk20a_ctxsw_trace_init(g);
#endif
g->ops.fifo.channel_resume(g); g->ops.fifo.channel_resume(g);
return 0; return 0;

6
drivers/gpu/nvgpu/os/linux/module.c
View File

@@ -209,6 +209,12 @@ int nvgpu_finalize_poweron_linux(struct nvgpu_os_linux *l)
return err; return err;
} }
#ifdef CONFIG_GK20A_CTXSW_TRACE
err = gk20a_ctxsw_trace_init(g);
if (err != 0)
nvgpu_warn(g, "could not initialize ctxsw tracing");
#endif
if (l->ops.clk.init_debugfs) { if (l->ops.clk.init_debugfs) {
err = l->ops.clk.init_debugfs(g); err = l->ops.clk.init_debugfs(g);
if (err) { if (err) {