[Intel-gfx] [PATCH] drm/i915: don't leak global_timeline

Chris Wilson chris at chris-wilson.co.uk
Wed Nov 16 20:57:59 UTC 2016


On Wed, Nov 16, 2016 at 07:32:49PM +0000, Matthew Auld wrote:
> We need to clean up the global_timeline in i915_gem_load_cleanup.
> 
> Cc: Chris Wilson <chris at chris-wilson.co.uk>
> Signed-off-by: Matthew Auld <matthew.auld at intel.com>
> ---
>  drivers/gpu/drm/i915/i915_gem.c | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
> index 3fb5e66..c440e72 100644
> --- a/drivers/gpu/drm/i915/i915_gem.c
> +++ b/drivers/gpu/drm/i915/i915_gem.c
> @@ -4557,6 +4557,8 @@ void i915_gem_load_cleanup(struct drm_device *dev)
>  
>  	WARN_ON(!llist_empty(&dev_priv->mm.free_list));
>  
> +	i915_gem_timeline_fini(&dev_priv->gt.global_timeline);

Once upon a time the global timeline didn't allocate.

However, to free the timeline I assert we hold the struct_mutex for
manipulatingn the timelines list (that's important for the client
timelines) and we don't hold the struct_mutex here.

Give it a mutex_lock() and a WARN_ON(!list_empty(&dev_priv->gt.timelines));
-Chris

-- 
Chris Wilson, Intel Open Source Technology Centre


More information about the Intel-gfx mailing list