From: Jason Ekstrand <jason@jlekstrand.net>
Date: Wed, 21 Jul 2021 15:23:53 +0000 (-0500)
Subject: drm/i915: Call i915_globals_exit() after i915_pmu_exit()
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=75d3bf84dfca2fd3f83125eb68f0f55c7018d4de;p=linux.git

drm/i915: Call i915_globals_exit() after i915_pmu_exit()

We should tear down in the opposite order we set up.

Signed-off-by: Jason Ekstrand <jason@jlekstrand.net>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20210721152358.2893314-2-jason@jlekstrand.net
---

diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c
index 866ba136794c1..2cdace47610b6 100644
--- a/drivers/gpu/drm/i915/i915_pci.c
+++ b/drivers/gpu/drm/i915/i915_pci.c
@@ -1209,8 +1209,8 @@ static void __exit i915_exit(void)
 
 	i915_perf_sysctl_unregister();
 	pci_unregister_driver(&i915_pci_driver);
-	i915_globals_exit();
 	i915_pmu_exit();
+	i915_globals_exit();
 }
 
 module_init(i915_init);