diff --git a/drivers/gpu/nvgpu/common/gr/gr_setup.c b/drivers/gpu/nvgpu/common/gr/gr_setup.c
index 6c04a7881..aaefba4c9 100644
--- a/drivers/gpu/nvgpu/common/gr/gr_setup.c
+++ b/drivers/gpu/nvgpu/common/gr/gr_setup.c
@@ -224,7 +224,6 @@ void nvgpu_gr_setup_free_subctx(struct nvgpu_channel *c)
 	}
 }
 
-#ifdef CONFIG_NVGPU_CHANNEL_TSG_CONTROL
 int nvgpu_gr_setup_set_preemption_mode(struct nvgpu_channel *ch,
 					u32 graphics_preempt_mode,
 					u32 compute_preempt_mode)
@@ -320,4 +319,3 @@ enable_ch:
 	}
 	return err;
 }
-#endif
diff --git a/drivers/gpu/nvgpu/hal/init/hal_gp10b.c b/drivers/gpu/nvgpu/hal/init/hal_gp10b.c
index c6db273fc..e7f4120fe 100644
--- a/drivers/gpu/nvgpu/hal/init/hal_gp10b.c
+++ b/drivers/gpu/nvgpu/hal/init/hal_gp10b.c
@@ -359,9 +359,7 @@ static const struct gpu_ops gp10b_ops = {
 #ifdef CONFIG_NVGPU_GRAPHICS
 			.bind_ctxsw_zcull = nvgpu_gr_setup_bind_ctxsw_zcull,
 #endif /* CONFIG_NVGPU_GRAPHICS */
-#ifdef CONFIG_NVGPU_CHANNEL_TSG_CONTROL
 			.set_preemption_mode = nvgpu_gr_setup_set_preemption_mode,
-#endif
 		},
 #ifdef CONFIG_NVGPU_GRAPHICS
 		.zbc = {
diff --git a/drivers/gpu/nvgpu/hal/init/hal_gv11b.c b/drivers/gpu/nvgpu/hal/init/hal_gv11b.c
index 6594f604d..efb05f090 100644
--- a/drivers/gpu/nvgpu/hal/init/hal_gv11b.c
+++ b/drivers/gpu/nvgpu/hal/init/hal_gv11b.c
@@ -433,9 +433,7 @@ static const struct gpu_ops gv11b_ops = {
 #ifdef CONFIG_NVGPU_GRAPHICS
 			.bind_ctxsw_zcull = nvgpu_gr_setup_bind_ctxsw_zcull,
 #endif /* CONFIG_NVGPU_GRAPHICS */
-#ifdef CONFIG_NVGPU_CHANNEL_TSG_CONTROL
 			.set_preemption_mode = nvgpu_gr_setup_set_preemption_mode,
-#endif
 		},
 #ifdef CONFIG_NVGPU_GRAPHICS
 		.zbc = {
diff --git a/drivers/gpu/nvgpu/hal/init/hal_tu104.c b/drivers/gpu/nvgpu/hal/init/hal_tu104.c
index f4f1406d7..796fb3f88 100644
--- a/drivers/gpu/nvgpu/hal/init/hal_tu104.c
+++ b/drivers/gpu/nvgpu/hal/init/hal_tu104.c
@@ -466,9 +466,7 @@ static const struct gpu_ops tu104_ops = {
 #ifdef CONFIG_NVGPU_GRAPHICS
 			.bind_ctxsw_zcull = nvgpu_gr_setup_bind_ctxsw_zcull,
 #endif /* CONFIG_NVGPU_GRAPHICS */
-#ifdef CONFIG_NVGPU_CHANNEL_TSG_CONTROL
 			.set_preemption_mode = nvgpu_gr_setup_set_preemption_mode,
-#endif
 		},
 #ifdef CONFIG_NVGPU_GRAPHICS
 		.zbc = {