drm/i915: Move unload time opregion unregistration earlier

Move the opregion unregistration earlier to match its corresponding
registration order.

Signed-off-by: Imre Deak <imre.deak@intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1458128348-15730-14-git-send-email-imre.deak@intel.com

diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
index fb28a03e96c67ee3619093b86779092ce3930934..7618a3f4c21fa8847597540e439d1bf554f58c31 100644 (file)
--- a/drivers/gpu/drm/i915/i915_dma.c
+++ b/drivers/gpu/drm/i915/i915_dma.c
@@ -1221,6 +1221,7 @@ int i915_driver_unload(struct drm_device *dev)
        i915_teardown_sysfs(dev);
 
        acpi_video_unregister();
+       intel_opregion_fini(dev);
        i915_gem_shrinker_cleanup(dev_priv);
 
        drm_vblank_cleanup(dev);
@@ -1250,8 +1251,6 @@ int i915_driver_unload(struct drm_device *dev)
        cancel_delayed_work_sync(&dev_priv->gpu_error.hangcheck_work);
        i915_destroy_error_state(dev);
 
-       intel_opregion_fini(dev);
-
        /* Flush any outstanding unpin_work. */
        flush_workqueue(dev_priv->wq);