diff --git a/drivers/gpu/nvgpu/gv11b/gr_gv11b.c b/drivers/gpu/nvgpu/gv11b/gr_gv11b.c
index 12b07d11c..9d0b4adee 100644
--- a/drivers/gpu/nvgpu/gv11b/gr_gv11b.c
+++ b/drivers/gpu/nvgpu/gv11b/gr_gv11b.c
@@ -1680,21 +1680,14 @@ static int gr_gv11b_handle_fecs_error(struct gk20a *g,
 		}
 
 		if (gk20a_gr_sm_debugger_attached(g)) {
+			gk20a_dbg_gpu_post_events(ch);
+
 			if (gk20a_is_channel_marked_as_tsg(ch)) {
 				struct tsg_gk20a *tsg = &g->fifo.tsg[ch->tsgid];
-				struct channel_gk20a *__ch;
-
-				mutex_lock(&tsg->ch_list_lock);
-				list_for_each_entry(__ch, &tsg->ch_list, ch_entry) {
-					gk20a_dbg_gpu_post_events(__ch);
-				}
-				mutex_unlock(&tsg->ch_list_lock);
 
 				gk20a_tsg_event_id_post_event(tsg,
 					NVGPU_IOCTL_CHANNEL_EVENT_ID_CILP_PREEMPTION_COMPLETE);
 			} else {
-				gk20a_dbg_gpu_post_events(ch);
-
 				gk20a_channel_event_id_post_event(ch,
 					NVGPU_IOCTL_CHANNEL_EVENT_ID_CILP_PREEMPTION_COMPLETE);
 			}