diff options
| author | Daniel Vetter | 2017-06-21 10:28:41 +0200 |
|---|---|---|
| committer | Daniel Vetter | 2017-06-26 11:03:19 +0200 |
| commit | baf54385af7856eab151edb0822dc95e7f5c8b14 (patch) | |
| tree | fd2b74256063707fab4a2359914ccd024fa977e0 /drivers/gpu/drm/i915/i915_drv.c | |
| parent | drm/kirin: Drop drm_vblank_cleanup (diff) | |
| download | kernel-qcow2-linux-baf54385af7856eab151edb0822dc95e7f5c8b14.tar.gz kernel-qcow2-linux-baf54385af7856eab151edb0822dc95e7f5c8b14.tar.xz kernel-qcow2-linux-baf54385af7856eab151edb0822dc95e7f5c8b14.zip | |
drm/i915: Drop drm_vblank_cleanup
On the load error path we can't have pending vblank interrupts, and on
unload we already call drm_atomic_helper_shutdown beforehand! So all
good to nuke it.
Reviewed-by: Sean Paul <seanpaul@chromium.org>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20170621082850.13224-5-daniel.vetter@ffwll.ch
Diffstat (limited to 'drivers/gpu/drm/i915/i915_drv.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_drv.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c index 6033355d9469..8d583a2fbf46 100644 --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c @@ -1264,7 +1264,7 @@ int i915_driver_load(struct pci_dev *pdev, const struct pci_device_id *ent) ret = i915_load_modeset_init(&dev_priv->drm); if (ret < 0) - goto out_cleanup_vblank; + goto out_cleanup_hw; i915_driver_register(dev_priv); @@ -1285,8 +1285,6 @@ int i915_driver_load(struct pci_dev *pdev, const struct pci_device_id *ent) return 0; -out_cleanup_vblank: - drm_vblank_cleanup(&dev_priv->drm); out_cleanup_hw: i915_driver_cleanup_hw(dev_priv); out_cleanup_mmio: @@ -1322,8 +1320,6 @@ void i915_driver_unload(struct drm_device *dev) i915_driver_unregister(dev_priv); - drm_vblank_cleanup(dev); - intel_modeset_cleanup(dev); /* |