[PATCH 2/6] drm/i915: Call i915_globals_exit() if pci_register_device() fails

[Daniel Vetter]

On Mon, Jul 19, 2021 at 01:30:43PM -0500, Jason Ekstrand wrote:
> In the unlikely event that pci_register_device() fails, we were tearing
> down our PMU setup but not globals.  This leaves a bunch of memory slabs
> lying around.
> 
> Signed-off-by: Jason Ekstrand <jason at jlekstrand.net>
> Fixes: 32eb6bcfdda9 ("drm/i915: Make request allocation caches global")
> Cc: Daniel Vetter <daniel at ffwll.ch>

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


> ---
>  drivers/gpu/drm/i915/i915_globals.c | 4 ++--
>  drivers/gpu/drm/i915/i915_pci.c     | 1 +
>  2 files changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/i915_globals.c b/drivers/gpu/drm/i915/i915_globals.c
> index 77f1911c463b8..87267e1d2ad92 100644
> --- a/drivers/gpu/drm/i915/i915_globals.c
> +++ b/drivers/gpu/drm/i915/i915_globals.c
> @@ -138,7 +138,7 @@ void i915_globals_unpark(void)
>  	atomic_inc(&active);
>  }
>  
> -static void __exit __i915_globals_flush(void)
> +static void __i915_globals_flush(void)
>  {
>  	atomic_inc(&active); /* skip shrinking */
>  
> @@ -148,7 +148,7 @@ static void __exit __i915_globals_flush(void)
>  	atomic_dec(&active);
>  }
>  
> -void __exit i915_globals_exit(void)
> +void i915_globals_exit(void)
>  {
>  	GEM_BUG_ON(atomic_read(&active));
>  
> diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c
> index 50ed93b03e582..4e627b57d31a2 100644
> --- a/drivers/gpu/drm/i915/i915_pci.c
> +++ b/drivers/gpu/drm/i915/i915_pci.c
> @@ -1230,6 +1230,7 @@ static int __init i915_init(void)
>  	err = pci_register_driver(&i915_pci_driver);
>  	if (err) {
>  		i915_pmu_exit();
> +		i915_globals_exit();
>  		return err;
>  	}
>  
> -- 
> 2.31.1
> 

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