[PATCH 1/2] drm/i915: Call i915_globals_exit() after i915_pmu_exit()

Daniel Vetter daniel at ffwll.ch
Mon Jul 19 08:29:34 UTC 2021


On Sat, Jul 17, 2021 at 12:48 AM Jason Ekstrand <jason at jlekstrand.net> wrote:
>
> We should tear down in the opposite order we set up.
>
> Signed-off-by: Jason Ekstrand <jason at jlekstrand.net>
> Fixes: 537f9c84a427 ("drm/i915/pmu: Fix CPU hotplug with multiple GPUs")
> Cc: Daniel Vetter <daniel at ffwll.ch>

Reviewed-by: Daniel Vetter <daniel.vetter at ffwll.ch>

> ---
>  drivers/gpu/drm/i915/i915_pci.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c
> index 67696d7522718..50ed93b03e582 100644
> --- a/drivers/gpu/drm/i915/i915_pci.c
> +++ b/drivers/gpu/drm/i915/i915_pci.c
> @@ -1244,8 +1244,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);
> --
> 2.31.1
>


-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch


More information about the dri-devel mailing list