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

Commit 3e783bac authored by Chris Wilson's avatar Chris Wilson
Browse files

drm/i915: Demidlayer driver unloading 



To complete the transition to manual control of load/unload, we need to
take over unloading from i915_pci_remove(). This allows us to correctly
order our unregister vs shutdown phases, which currently are inverted
due to the midlayer.

However, the unload sequence is still invalid as we shutdown the driver
with the last reference. Ideally, all we want to do is remove the
userspace access on device removal, deferring the cleanup to the
drm_dev_release() - breaking the reference cycles is then left as an
exercise for the reader.

Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/1466773227-7994-7-git-send-email-chris@chris-wilson.co.uk
parent 8f460e2c

drivers/gpu/drm/i915/i915_dma.c

+4 −0
Original line number Diff line number Diff line
@@ -1435,12 +1435,16 @@ static void i915_driver_register(struct drm_i915_private *dev_priv) 
static void i915_driver_unregister(struct drm_i915_private *dev_priv)

{

	i915_audio_component_cleanup(dev_priv);



	intel_gpu_ips_teardown();

	acpi_video_unregister();

	intel_opregion_unregister(dev_priv);



	intel_modeset_unregister(dev_priv);

	i915_teardown_sysfs(dev_priv->dev);

	i915_debugfs_unregister(dev_priv);

	drm_dev_unregister(dev_priv->dev);



	i915_gem_shrinker_cleanup(dev_priv);

}

drivers/gpu/drm/i915/i915_drv.c

+2 −2
Original line number Diff line number Diff line
@@ -1042,7 +1042,8 @@ i915_pci_remove(struct pci_dev *pdev) 
{

	struct drm_device *dev = pci_get_drvdata(pdev);



	drm_put_dev(dev);

	i915_driver_unload(dev);

	drm_dev_unref(dev);

}



static int i915_pm_suspend(struct device *dev)
@@ -1748,7 +1749,6 @@ static struct drm_driver driver = { 
	.driver_features =

	    DRIVER_HAVE_IRQ | DRIVER_IRQ_SHARED | DRIVER_GEM | DRIVER_PRIME |

	    DRIVER_RENDER | DRIVER_MODESET,

	.unload = i915_driver_unload,

	.open = i915_driver_open,

	.lastclose = i915_driver_lastclose,

	.preclose = i915_driver_preclose,