diff --git a/drivers/gpu/nvgpu/gk20a/ctxsw_trace_gk20a.c b/drivers/gpu/nvgpu/gk20a/ctxsw_trace_gk20a.c
index ffd15a37f..4e265b81c 100644
--- a/drivers/gpu/nvgpu/gk20a/ctxsw_trace_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/ctxsw_trace_gk20a.c
@@ -518,9 +518,6 @@ int gk20a_ctxsw_trace_init(struct gk20a *g)
 	if (unlikely(err))
 		goto fail;
 
-	g->gpu_characteristics.flags |=
-		NVGPU_GPU_FLAGS_SUPPORT_FECS_CTXSW_TRACE;
-
 	return 0;
 
 fail:
diff --git a/drivers/gpu/nvgpu/gk20a/fecs_trace_gk20a.c b/drivers/gpu/nvgpu/gk20a/fecs_trace_gk20a.c
index 8244403e2..05c53a668 100644
--- a/drivers/gpu/nvgpu/gk20a/fecs_trace_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/fecs_trace_gk20a.c
@@ -584,6 +584,9 @@ static int gk20a_fecs_trace_init(struct gk20a *g)
 	nvgpu_mutex_init(&trace->hash_lock);
 	hash_init(trace->pid_hash_table);
 
+	g->gpu_characteristics.flags |=
+		NVGPU_GPU_FLAGS_SUPPORT_FECS_CTXSW_TRACE;
+
 	gk20a_fecs_trace_debugfs_init(g);
 	return 0;
 
diff --git a/drivers/gpu/nvgpu/vgpu/fecs_trace_vgpu.c b/drivers/gpu/nvgpu/vgpu/fecs_trace_vgpu.c
index c80da26d9..6396ee4c1 100644
--- a/drivers/gpu/nvgpu/vgpu/fecs_trace_vgpu.c
+++ b/drivers/gpu/nvgpu/vgpu/fecs_trace_vgpu.c
@@ -52,6 +52,8 @@ static int vgpu_fecs_trace_init(struct gk20a *g)
 		dev_info(dev_from_gk20a(g), "does not support fecs trace\n");
 		goto fail;
 	}
+	g->gpu_characteristics.flags |=
+		NVGPU_GPU_FLAGS_SUPPORT_FECS_CTXSW_TRACE;
 
 	hv_np = args.np;
 	mempool = args.args[0];