diff options
| author | Daniel Vetter | 2017-07-15 00:46:56 +0200 |
|---|---|---|
| committer | Daniel Vetter | 2017-07-19 14:29:25 +0200 |
| commit | 99c539bef5385099585335897185a014a8dfe1bf (patch) | |
| tree | 14ded57428397fabbd9257a021ef921deff3304f /drivers/gpu/drm/i915/i915_drv.c | |
| parent | drm/i915: Fix fbdev unload sequence (diff) | |
| download | kernel-qcow2-linux-99c539bef5385099585335897185a014a8dfe1bf.tar.gz kernel-qcow2-linux-99c539bef5385099585335897185a014a8dfe1bf.tar.xz kernel-qcow2-linux-99c539bef5385099585335897185a014a8dfe1bf.zip | |
drm/i915: unregister interfaces first in unload
We first need to make sure no one else can get at us anymore,
before we can proceed to tear down all the datastructures.
Just a small step towards eventually the perfect unload code ...
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20170714224656.6431-3-daniel.vetter@ffwll.ch
Diffstat (limited to 'drivers/gpu/drm/i915/i915_drv.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_drv.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c index ffeb3a3bed58..f406aec8a499 100644 --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c @@ -1375,6 +1375,8 @@ void i915_driver_unload(struct drm_device *dev) struct drm_i915_private *dev_priv = to_i915(dev); struct pci_dev *pdev = dev_priv->drm.pdev; + i915_driver_unregister(dev_priv); + if (i915_gem_suspend(dev_priv)) DRM_ERROR("failed to idle hardware; continuing to unload!\n"); @@ -1384,8 +1386,6 @@ void i915_driver_unload(struct drm_device *dev) intel_gvt_cleanup(dev_priv); - i915_driver_unregister(dev_priv); - drm_vblank_cleanup(dev); intel_modeset_cleanup(dev); |