diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2010-08-21 00:26:30 +0400 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2010-09-08 13:13:27 +0400 |
| commit | 67e77c5ae8bff6f805d207541f1315051248a87b (patch) | |
| tree | 56a845d734e9a8ed8027683ba0897fd95d280652 /drivers/gpu/drm/i915/i915_dma.c | |
| parent | 3dec0095f71e7d00b7f6180229fd32a2d0a6ce8d (diff) | |
| download | linux-67e77c5ae8bff6f805d207541f1315051248a87b.tar.xz | |
drm/i915: unload: fix unpin_work related races
Kill any outstanding unpin_work when destroying the corresponding
crtc. Then flush the workqueue before the gem teardown, in case
any unpin work is still outstanding.
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_dma.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_dma.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c index 970c338323a8..27a826e3170a 100644 --- a/drivers/gpu/drm/i915/i915_dma.c +++ b/drivers/gpu/drm/i915/i915_dma.c @@ -2292,6 +2292,9 @@ int i915_driver_unload(struct drm_device *dev) intel_opregion_free(dev, 0); if (drm_core_check_feature(dev, DRIVER_MODESET)) { + /* Flush any outstanding unpin_work. */ + flush_workqueue(dev_priv->wq); + i915_gem_free_all_phys_object(dev); mutex_lock(&dev->struct_mutex); |