diff --git a/drivers/gpu/nvgpu/common/netlist/netlist.c b/drivers/gpu/nvgpu/common/netlist/netlist.c
index 42a38f8ea..2b1364330 100644
--- a/drivers/gpu/nvgpu/common/netlist/netlist.c
+++ b/drivers/gpu/nvgpu/common/netlist/netlist.c
@@ -669,26 +669,6 @@ u32 nvgpu_netlist_get_gpccs_data_count(struct gk20a *g)
 	return g->netlist_vars->ucode.gpccs.data.count;
 }
 
-void nvgpu_netlist_set_fecs_inst_count(struct gk20a *g, u32 count)
-{
-	g->netlist_vars->ucode.fecs.inst.count = count;
-}
-
-void nvgpu_netlist_set_fecs_data_count(struct gk20a *g, u32 count)
-{
-	g->netlist_vars->ucode.fecs.data.count = count;
-}
-
-void nvgpu_netlist_set_gpccs_inst_count(struct gk20a *g, u32 count)
-{
-	g->netlist_vars->ucode.gpccs.inst.count = count;
-}
-
-void nvgpu_netlist_set_gpccs_data_count(struct gk20a *g, u32 count)
-{
-	g->netlist_vars->ucode.gpccs.data.count = count;
-}
-
 u32 *nvgpu_netlist_get_fecs_inst_list(struct gk20a *g)
 {
 	return g->netlist_vars->ucode.fecs.inst.l;
@@ -709,26 +689,6 @@ u32 *nvgpu_netlist_get_gpccs_data_list(struct gk20a *g)
 	return g->netlist_vars->ucode.gpccs.data.l;
 }
 
-struct netlist_u32_list *nvgpu_netlist_get_fecs_inst(struct gk20a *g)
-{
-	return &g->netlist_vars->ucode.fecs.inst;
-}
-
-struct netlist_u32_list *nvgpu_netlist_get_fecs_data(struct gk20a *g)
-{
-	return &g->netlist_vars->ucode.fecs.data;
-}
-
-struct netlist_u32_list *nvgpu_netlist_get_gpccs_inst(struct gk20a *g)
-{
-	return &g->netlist_vars->ucode.gpccs.inst;
-}
-
-struct netlist_u32_list *nvgpu_netlist_get_gpccs_data(struct gk20a *g)
-{
-	return &g->netlist_vars->ucode.gpccs.data;
-}
-
 #ifdef CONFIG_NVGPU_DEBUGGER
 struct netlist_aiv_list *nvgpu_netlist_get_sys_ctxsw_regs(struct gk20a *g)
 {
@@ -846,6 +806,48 @@ struct netlist_aiv_list *nvgpu_netlist_get_pm_cau_ctxsw_regs(struct gk20a *g)
 }
 #endif /* CONFIG_NVGPU_DEBUGGER */
 
+#ifdef CONFIG_NVGPU_NON_FUSA
+void nvgpu_netlist_set_fecs_inst_count(struct gk20a *g, u32 count)
+{
+	g->netlist_vars->ucode.fecs.inst.count = count;
+}
+
+void nvgpu_netlist_set_fecs_data_count(struct gk20a *g, u32 count)
+{
+	g->netlist_vars->ucode.fecs.data.count = count;
+}
+
+void nvgpu_netlist_set_gpccs_inst_count(struct gk20a *g, u32 count)
+{
+	g->netlist_vars->ucode.gpccs.inst.count = count;
+}
+
+void nvgpu_netlist_set_gpccs_data_count(struct gk20a *g, u32 count)
+{
+	g->netlist_vars->ucode.gpccs.data.count = count;
+}
+
+struct netlist_u32_list *nvgpu_netlist_get_fecs_inst(struct gk20a *g)
+{
+	return &g->netlist_vars->ucode.fecs.inst;
+}
+
+struct netlist_u32_list *nvgpu_netlist_get_fecs_data(struct gk20a *g)
+{
+	return &g->netlist_vars->ucode.fecs.data;
+}
+
+struct netlist_u32_list *nvgpu_netlist_get_gpccs_inst(struct gk20a *g)
+{
+	return &g->netlist_vars->ucode.gpccs.inst;
+}
+
+struct netlist_u32_list *nvgpu_netlist_get_gpccs_data(struct gk20a *g)
+{
+	return &g->netlist_vars->ucode.gpccs.data;
+}
+
+
 void nvgpu_netlist_vars_set_dynamic(struct gk20a *g, bool set)
 {
 	g->netlist_vars->dynamic = set;
@@ -860,3 +862,4 @@ void nvgpu_netlist_vars_set_regs_base_index(struct gk20a *g, u32 index)
 {
 	g->netlist_vars->regs_base_index = index;
 }
+#endif
diff --git a/drivers/gpu/nvgpu/include/nvgpu/netlist.h b/drivers/gpu/nvgpu/include/nvgpu/netlist.h
index 9148d7e18..af170c44f 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/netlist.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/netlist.h
@@ -88,18 +88,10 @@ u32 nvgpu_netlist_get_fecs_inst_count(struct gk20a *g);
 u32 nvgpu_netlist_get_fecs_data_count(struct gk20a *g);
 u32 nvgpu_netlist_get_gpccs_inst_count(struct gk20a *g);
 u32 nvgpu_netlist_get_gpccs_data_count(struct gk20a *g);
-void nvgpu_netlist_set_fecs_inst_count(struct gk20a *g, u32 count);
-void nvgpu_netlist_set_fecs_data_count(struct gk20a *g, u32 count);
-void nvgpu_netlist_set_gpccs_inst_count(struct gk20a *g, u32 count);
-void nvgpu_netlist_set_gpccs_data_count(struct gk20a *g, u32 count);
 u32 *nvgpu_netlist_get_fecs_inst_list(struct gk20a *g);
 u32 *nvgpu_netlist_get_fecs_data_list(struct gk20a *g);
 u32 *nvgpu_netlist_get_gpccs_inst_list(struct gk20a *g);
 u32 *nvgpu_netlist_get_gpccs_data_list(struct gk20a *g);
-struct netlist_u32_list *nvgpu_netlist_get_fecs_inst(struct gk20a *g);
-struct netlist_u32_list *nvgpu_netlist_get_fecs_data(struct gk20a *g);
-struct netlist_u32_list *nvgpu_netlist_get_gpccs_inst(struct gk20a *g);
-struct netlist_u32_list *nvgpu_netlist_get_gpccs_data(struct gk20a *g);
 
 #ifdef CONFIG_NVGPU_DEBUGGER
 struct netlist_aiv_list *nvgpu_netlist_get_sys_ctxsw_regs(struct gk20a *g);
@@ -132,8 +124,20 @@ struct netlist_aiv_list *nvgpu_netlist_get_etpc_ctxsw_regs(struct gk20a *g);
 struct netlist_aiv_list *nvgpu_netlist_get_pm_cau_ctxsw_regs(struct gk20a *g);
 #endif /* CONFIG_NVGPU_DEBUGGER */
 
+#ifdef CONFIG_NVGPU_NON_FUSA
+void nvgpu_netlist_set_fecs_inst_count(struct gk20a *g, u32 count);
+void nvgpu_netlist_set_fecs_data_count(struct gk20a *g, u32 count);
+void nvgpu_netlist_set_gpccs_inst_count(struct gk20a *g, u32 count);
+void nvgpu_netlist_set_gpccs_data_count(struct gk20a *g, u32 count);
+
+struct netlist_u32_list *nvgpu_netlist_get_fecs_inst(struct gk20a *g);
+struct netlist_u32_list *nvgpu_netlist_get_fecs_data(struct gk20a *g);
+struct netlist_u32_list *nvgpu_netlist_get_gpccs_inst(struct gk20a *g);
+struct netlist_u32_list *nvgpu_netlist_get_gpccs_data(struct gk20a *g);
+
 void nvgpu_netlist_vars_set_dynamic(struct gk20a *g, bool set);
 void nvgpu_netlist_vars_set_buffer_size(struct gk20a *g, u32 size);
 void nvgpu_netlist_vars_set_regs_base_index(struct gk20a *g, u32 index);
+#endif
 
 #endif /* NVGPU_NETLIST_H */