diff options
| author | Chris Wilson | 2018-07-10 11:44:20 +0200 |
|---|---|---|
| committer | Chris Wilson | 2018-07-10 14:59:00 +0200 |
| commit | 8bcf9f7034d81979837e97a6509b0b2a96f8f4c8 (patch) | |
| tree | ede85f6ff536a9db0e07917397d58846b5549f60 /drivers/gpu/drm/i915/i915_gem.c | |
| parent | drm/i915: Tidy i915_gem_suspend() (diff) | |
| download | kernel-qcow2-linux-8bcf9f7034d81979837e97a6509b0b2a96f8f4c8.tar.gz kernel-qcow2-linux-8bcf9f7034d81979837e97a6509b0b2a96f8f4c8.tar.xz kernel-qcow2-linux-8bcf9f7034d81979837e97a6509b0b2a96f8f4c8.zip | |
drm/i915: Flush the residual parking on emergency shutdown
On unwinding following a critical failure inside GEM init, we also need
to be sure to flush the workers before unloading the module.
Testcase: igt/drv_module_reload/basic-reload-inject
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Matthew Auld <matthew.auld@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180710094421.16223-1-chris@chris-wilson.co.uk
Diffstat (limited to 'drivers/gpu/drm/i915/i915_gem.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_gem.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index 25728c9d2727..07a92ca61dbf 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c @@ -5550,6 +5550,8 @@ err_init_hw: WARN_ON(i915_gem_suspend(dev_priv)); i915_gem_suspend_late(dev_priv); + i915_gem_drain_workqueue(dev_priv); + mutex_lock(&dev_priv->drm.struct_mutex); intel_uc_fini_hw(dev_priv); err_uc_init: |