diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2019-07-03 18:19:13 +0100 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2019-07-04 13:44:10 +0100 |
| commit | 4fda44bf16b79a0b78fe36c6b9859e9ce2d09f43 (patch) | |
| tree | db88f80ec456f8445d70a683bafb77382e842c26 /drivers/gpu/drm/i915/i915_drv.h | |
| parent | 2006058e9988421a113e8edc004a8e0eae1a6d3f (diff) | |
| download | linux-4fda44bf16b79a0b78fe36c6b9859e9ce2d09f43.tar.gz linux-4fda44bf16b79a0b78fe36c6b9859e9ce2d09f43.tar.bz2 linux-4fda44bf16b79a0b78fe36c6b9859e9ce2d09f43.zip | |
drm/i915: Flush the workqueue before draining
Trying to drain a workqueue while we may still be adding to it from
background tasks is, according to kernel/workqueue.c, verboten. So, add
a flush_workqueue() at the start of our cleanup procedure.
References: https://bugs.freedesktop.org/show_bug.cgi?id=110550
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Mika Kuoppala <mika.kuoppala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190703171913.16585-4-chris@chris-wilson.co.uk
Diffstat (limited to 'drivers/gpu/drm/i915/i915_drv.h')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_drv.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index ca3afe6e95b5..a4ae9ea298dd 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@ -2473,6 +2473,7 @@ static inline void i915_gem_drain_workqueue(struct drm_i915_private *i915) */ int pass = 3; do { + flush_workqueue(i915->wq); rcu_barrier(); i915_gem_drain_freed_objects(i915); } while (--pass); |