diff mbox series

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

Message ID 20210716224758.2162003-1-jason@jlekstrand.net (mailing list archive)
State New, archived
Headers show
Series [1/2] drm/i915: Call i915_globals_exit() after i915_pmu_exit() | expand

Commit Message

Jason Ekstrand July 16, 2021, 10:47 p.m. UTC
We should tear down in the opposite order we set up.

Signed-off-by: Jason Ekstrand <jason@jlekstrand.net>
Fixes: 537f9c84a427 ("drm/i915/pmu: Fix CPU hotplug with multiple GPUs")
Cc: Daniel Vetter <daniel@ffwll.ch>
---
 drivers/gpu/drm/i915/i915_pci.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

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

Reviewed-by: Daniel Vetter <daniel.vetter@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
>
Tvrtko Ursulin July 19, 2021, 8:55 a.m. UTC | #2
Noticed PMU being mentioned..

On 16/07/2021 23:47, Jason Ekstrand wrote:
> We should tear down in the opposite order we set up.
> 
> Signed-off-by: Jason Ekstrand <jason@jlekstrand.net>
> Fixes: 537f9c84a427 ("drm/i915/pmu: Fix CPU hotplug with multiple GPUs")

1)
You can use 'dim fixes <sha>' to get you the correct cc list when using 
the fixes tag. But:

2)
Fixes tag looks like should be removed to avoid potential needless 
backporting since I can't see that there is any inter-dependency between 
i915_pmu_exit and i915_globals_exit, hence nothing is getting fixes 
really, just tidying of the order.

With fixes removed:

Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>

Regards,

Tvrtko

> Cc: Daniel Vetter <daniel@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);
>
diff mbox series

Patch

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);