All of lore.kernel.org
 help / color / mirror / Atom feed
From: Daniel Vetter <daniel@ffwll.ch>
To: deepak.s@linux.intel.com
Cc: intel-gfx@lists.freedesktop.org
Subject: Re: [PATCH] drm/i915: Clean-up idr table if context create fails.
Date: Mon, 30 Mar 2015 17:43:34 +0200	[thread overview]
Message-ID: <20150330154334.GC6354@phenom.ffwll.local> (raw)
In-Reply-To: <1427726038-19718-1-git-send-email-deepak.s@linux.intel.com>

On Mon, Mar 30, 2015 at 08:03:58PM +0530, deepak.s@linux.intel.com wrote:
> From: Deepak S <deepak.s@linux.intel.com>
> 
> Cleanup idr table if any error happens after __create_hw_context() in
> i915_gem_create_context()
> 
> Signed-off-by: Deepak S <deepak.s@linux.intel.com>
> ---
>  drivers/gpu/drm/i915/i915_gem_context.c | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/drivers/gpu/drm/i915/i915_gem_context.c b/drivers/gpu/drm/i915/i915_gem_context.c
> index f3e84c4..69bebe5 100644
> --- a/drivers/gpu/drm/i915/i915_gem_context.c
> +++ b/drivers/gpu/drm/i915/i915_gem_context.c
> @@ -287,6 +287,8 @@ err_unpin:
>  	if (is_global_default_ctx && ctx->legacy_hw_ctx.rcs_state)
>  		i915_gem_object_ggtt_unpin(ctx->legacy_hw_ctx.rcs_state);
>  err_destroy:
> +	if (ctx->file_priv)
> +		idr_remove(&ctx->file_priv->context_idr, ctx->user_handle);

The common approach is to add a new err_idr: label at the op of the unwind
code and make the call to idr_remove unconditional.

Thanks, Daniel

>  	i915_gem_context_unreference(ctx);
>  	return ERR_PTR(ret);
>  }
> -- 
> 1.9.1
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx

-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

  reply	other threads:[~2015-03-30 15:41 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-03-30 14:33 [PATCH] drm/i915: Clean-up idr table if context create fails deepak.s
2015-03-30 15:43 ` Daniel Vetter [this message]
2015-04-02 13:19   ` Deepak S
2015-04-02 13:22     ` [PATCH v2] " deepak.s
2015-04-02 23:00       ` shuang.he
2015-04-07  8:20     ` [PATCH] " Daniel Vetter
2015-04-07  8:32       ` Chris Wilson
2015-04-07 15:11         ` Deepak S
2015-03-30 17:06 ` shuang.he

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=20150330154334.GC6354@phenom.ffwll.local \
    --to=daniel@ffwll.ch \
    --cc=deepak.s@linux.intel.com \
    --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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.