diff --git a/drivers/gpu/nvgpu/gv100/hal_gv100.c b/drivers/gpu/nvgpu/gv100/hal_gv100.c
index 61e9e46d4..0950409f9 100644
--- a/drivers/gpu/nvgpu/gv100/hal_gv100.c
+++ b/drivers/gpu/nvgpu/gv100/hal_gv100.c
@@ -709,7 +709,9 @@ int gv100_init_hal(struct gk20a *g)
 	gops->fifo = gv100_ops.fifo;
 	gops->gr_ctx = gv100_ops.gr_ctx;
 	gops->mm = gv100_ops.mm;
+#ifdef CONFIG_GK20A_CTXSW_TRACE
 	gops->fecs_trace = gv100_ops.fecs_trace;
+#endif
 	gops->pramin = gv100_ops.pramin;
 	gops->therm = gv100_ops.therm;
 	gops->pmu = gv100_ops.pmu;
diff --git a/drivers/gpu/nvgpu/gv11b/fifo_gv11b.c b/drivers/gpu/nvgpu/gv11b/fifo_gv11b.c
index dc3b641a6..d74ddacde 100644
--- a/drivers/gpu/nvgpu/gv11b/fifo_gv11b.c
+++ b/drivers/gpu/nvgpu/gv11b/fifo_gv11b.c
@@ -1075,10 +1075,12 @@ void gv11b_fifo_teardown_ch_tsg(struct gk20a *g, u32 act_eng_bitmask,
 		}
 	}
 
+#ifdef CONFIG_GK20A_CTXSW_TRACE
 	if (refch)
 		gk20a_ctxsw_trace_channel_reset(g, refch);
 	else if (tsg)
 		gk20a_ctxsw_trace_tsg_reset(g, tsg);
+#endif
 
 	gk20a_fifo_set_runlist_state(g, runlists_mask, RUNLIST_ENABLED,
 					 !RUNLIST_INFO_MUTEX_LOCKED);
diff --git a/drivers/gpu/nvgpu/gv11b/hal_gv11b.c b/drivers/gpu/nvgpu/gv11b/hal_gv11b.c
index 4de9786b8..39f9572c4 100644
--- a/drivers/gpu/nvgpu/gv11b/hal_gv11b.c
+++ b/drivers/gpu/nvgpu/gv11b/hal_gv11b.c
@@ -687,7 +687,9 @@ int gv11b_init_hal(struct gk20a *g)
 	gops->fifo = gv11b_ops.fifo;
 	gops->gr_ctx = gv11b_ops.gr_ctx;
 	gops->mm = gv11b_ops.mm;
+#ifdef CONFIG_GK20A_CTXSW_TRACE
 	gops->fecs_trace = gv11b_ops.fecs_trace;
+#endif
 	gops->therm = gv11b_ops.therm;
 	gops->pmu = gv11b_ops.pmu;
 	gops->regops = gv11b_ops.regops;