blob: 73efd7ef0b4757f126383912db35393cf54870ed (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
|
From 6380a6cc682e67bd790ad81ef03c5c244e67b27c Mon Sep 17 00:00:00 2001
From: Andres Rodriguez <andres.rodriguez@amd.com>
Date: Wed, 17 Aug 2016 17:52:46 -0400
Subject: [PATCH 1489/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 <andres.rodriguez@amd.com>
---
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
|
