Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit baf54385 authored by Daniel Vetter's avatar Daniel Vetter
Browse files

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: default avatarSean Paul <seanpaul@chromium.org>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20170621082850.13224-5-daniel.vetter@ffwll.ch
parent 20db9a2a

drivers/gpu/drm/i915/i915_drv.c

+1 −5
Original line number Diff line number Diff line
@@ -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);



	/*