From c58af8804ea423a9e568b68743f5b83ff1561d8f Mon Sep 17 00:00:00 2001 From: Andres Rodriguez Date: Wed, 17 Aug 2016 17:52:46 -0400 Subject: [PATCH 1174/4131] drm/amdkfd: wait only for IH work on IH exit We don't need to wait for all work to complete in the IH exit function. We only need to make sure the interrupt_work has finished executing to guarantee that ih_kfifo is no longer in use. Change-Id: I6286a22278797dcc3a3bcacfc84479401a26a246 Signed-off-by: Andres Rodriguez --- drivers/gpu/drm/amd/amdkfd/kfd_interrupt.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_interrupt.c b/drivers/gpu/drm/amd/amdkfd/kfd_interrupt.c index 847aeca..495e1ba 100644 --- a/drivers/gpu/drm/amd/amdkfd/kfd_interrupt.c +++ b/drivers/gpu/drm/amd/amdkfd/kfd_interrupt.c @@ -91,11 +91,11 @@ void kfd_interrupt_exit(struct kfd_dev *kfd) spin_unlock_irqrestore(&kfd->interrupt_lock, flags); /* - * Flush_scheduled_work ensures that there are no outstanding + * flush_work ensures that there are no outstanding * work-queue items that will access interrupt_ring. New work items * can't be created because we stopped interrupt handling above. */ - flush_scheduled_work(); + flush_work(&kfd->interrupt_work); kfifo_free(&kfd->ih_fifo); } -- 2.7.4