diff options
Diffstat (limited to 'drivers/gpu/nvgpu')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/channel_gk20a.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/channel_gk20a.c b/drivers/gpu/nvgpu/gk20a/channel_gk20a.c index d94e12a2..9e023e16 100644 --- a/drivers/gpu/nvgpu/gk20a/channel_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/channel_gk20a.c | |||
@@ -2778,11 +2778,10 @@ int gk20a_channel_suspend(struct gk20a *g) | |||
2778 | g->ops.fifo.disable_channel(ch); | 2778 | g->ops.fifo.disable_channel(ch); |
2779 | /* preempt the channel */ | 2779 | /* preempt the channel */ |
2780 | g->ops.fifo.preempt_channel(g, chid); | 2780 | g->ops.fifo.preempt_channel(g, chid); |
2781 | /* wait for channel update notifiers */ | ||
2782 | if (ch->update_fn && | ||
2783 | work_pending(&ch->update_fn_work)) | ||
2784 | flush_work(&ch->update_fn_work); | ||
2785 | gk20a_channel_cancel_job_clean_up(ch, true); | 2781 | gk20a_channel_cancel_job_clean_up(ch, true); |
2782 | /* wait for channel update notifiers */ | ||
2783 | if (ch->update_fn) | ||
2784 | cancel_work_sync(&ch->update_fn_work); | ||
2786 | 2785 | ||
2787 | channels_in_use = true; | 2786 | channels_in_use = true; |
2788 | 2787 | ||