From fbf107bdbd449494e6b17589f0a8a02094b52a19 Mon Sep 17 00:00:00 2001 From: Imre Deak <imre.deak@intel.com> Date: Wed, 16 Mar 2016 13:39:02 +0200 Subject: [PATCH] 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 --- drivers/gpu/drm/i915/i915_dma.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c index fb28a03e96c67..7618a3f4c21fa 100644 --- 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); -- 2.30.2