From 2f5e5596d3f9fa2b6ed30036ded1989360fedd9a Mon Sep 17 00:00:00 2001
From: Deepak Nibade <dnibade@nvidia.com>
Date: Thu, 7 Mar 2019 15:52:49 +0530
Subject: [PATCH] gpu: nvgpu: move FECS trace initialization call to linux

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>
---
 drivers/gpu/nvgpu/common/init/nvgpu_init.c | 7 -------
 drivers/gpu/nvgpu/common/vgpu/vgpu.c       | 3 ---
 drivers/gpu/nvgpu/os/linux/module.c        | 6 ++++++
 3 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/drivers/gpu/nvgpu/common/init/nvgpu_init.c b/drivers/gpu/nvgpu/common/init/nvgpu_init.c
index 80f8f6c0e..78e5368f1 100644
--- a/drivers/gpu/nvgpu/common/init/nvgpu_init.c
+++ b/drivers/gpu/nvgpu/common/init/nvgpu_init.c
@@ -33,7 +33,6 @@
 #include <nvgpu/ltc.h>
 #include <nvgpu/vidmem.h>
 #include <nvgpu/mm.h>
-#include <nvgpu/ctxsw_trace.h>
 #include <nvgpu/soc.h>
 #include <nvgpu/clk_arb.h>
 #include <nvgpu/therm.h>
@@ -376,12 +375,6 @@ int gk20a_finalize_poweron(struct gk20a *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 */
 	g->ops.fb.set_debug_mode(g, g->mmu_debug_ctrl);
 
diff --git a/drivers/gpu/nvgpu/common/vgpu/vgpu.c b/drivers/gpu/nvgpu/common/vgpu/vgpu.c
index a167d1dc7..cd312476d 100644
--- a/drivers/gpu/nvgpu/common/vgpu/vgpu.c
+++ b/drivers/gpu/nvgpu/common/vgpu/vgpu.c
@@ -456,9 +456,6 @@ int vgpu_finalize_poweron_common(struct gk20a *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);
 
 	return 0;
diff --git a/drivers/gpu/nvgpu/os/linux/module.c b/drivers/gpu/nvgpu/os/linux/module.c
index f6a20b0ce..fd63aa3bf 100644
--- a/drivers/gpu/nvgpu/os/linux/module.c
+++ b/drivers/gpu/nvgpu/os/linux/module.c
@@ -209,6 +209,12 @@ int nvgpu_finalize_poweron_linux(struct nvgpu_os_linux *l)
 		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) {
 		err = l->ops.clk.init_debugfs(g);
 		if (err) {