[Intel-gfx] [PATCH 1/3] drm/i915: remove bogus mutex_unlock from error-path

Ben Widawsky ben at bwidawsk.net
Wed Feb 13 06:27:13 CET 2013


On Tue, Feb 12, 2013 at 03:36:03PM +0100, Daniel Vetter wrote:
> This has been lost in the locking rework for intel_alloc_context_page:
> 
> commit 2c34b850ee1e9f86b41706149d0954eee58757a3
> Author: Ben Widawsky <ben at bwidawsk.net>
> Date:   Sat Mar 19 18:14:26 2011 -0700
> 
>     drm/i915: fix ilk rc6 teardown locking
> 
> Cc: Ben Widawsky <ben at bwidawsk.net>
> Signed-off-by: Daniel Vetter <daniel.vetter at ffwll.ch>

I'm confused about how it got lost.
Reviewed-by: Ben Widawsky <ben at bwidawsk.net>

> ---
>  drivers/gpu/drm/i915/intel_pm.c |    1 -
>  1 file changed, 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
> index 3280cff..7658c39 100644
> --- a/drivers/gpu/drm/i915/intel_pm.c
> +++ b/drivers/gpu/drm/i915/intel_pm.c
> @@ -2286,7 +2286,6 @@ err_unpin:
>  	i915_gem_object_unpin(ctx);
>  err_unref:
>  	drm_gem_object_unreference(&ctx->base);
> -	mutex_unlock(&dev->struct_mutex);
>  	return NULL;
>  }
>  
> -- 
> 1.7.10.4
> 

-- 
Ben Widawsky, Intel Open Source Technology Center



More information about the Intel-gfx mailing list