Intel-GFX Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Ben Widawsky <ben@bwidawsk.net>
To: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Intel Graphics Development <intel-gfx@lists.freedesktop.org>
Subject: Re: [PATCH 1/3] drm/i915: remove bogus mutex_unlock from error-path
Date: Tue, 12 Feb 2013 21:27:13 -0800	[thread overview]
Message-ID: <20130213052713.GA12888@lundgren.kumite> (raw)
In-Reply-To: <1360679765-9039-2-git-send-email-daniel.vetter@ffwll.ch>

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@bwidawsk.net>
> Date:   Sat Mar 19 18:14:26 2011 -0700
> 
>     drm/i915: fix ilk rc6 teardown locking
> 
> Cc: Ben Widawsky <ben@bwidawsk.net>
> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

I'm confused about how it got lost.
Reviewed-by: Ben Widawsky <ben@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

  reply	other threads:[~2013-02-13  5:25 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-02-12 14:36 [PATCH 0/3] some locking clarifications Daniel Vetter
2013-02-12 14:36 ` [PATCH 1/3] drm/i915: remove bogus mutex_unlock from error-path Daniel Vetter
2013-02-13  5:27   ` Ben Widawsky [this message]
2013-02-12 14:36 ` [PATCH 2/3] drm/i915: cancel console_resume_work before destroying the fbdev Daniel Vetter
2013-02-12 14:36 ` [PATCH 3/3] drm/i915: push struct_mutex locking down to ironlake_enable_rc6 Daniel Vetter

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20130213052713.GA12888@lundgren.kumite \
    --to=ben@bwidawsk.net \
    --cc=daniel.vetter@ffwll.ch \
    --cc=intel-gfx@lists.freedesktop.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox