From mboxrd@z Thu Jan 1 00:00:00 1970 From: Mika Kuoppala Subject: Re: [PATCH] [v2] drm/i915/ppgtt: Never return a NULL context Date: Thu, 02 Jan 2014 16:34:06 +0200 Message-ID: <87vby2zc4h.fsf@gaia.fi.intel.com> References: <1387745709-17607-1-git-send-email-benjamin.widawsky@intel.com> <1388555170-19936-1-git-send-email-benjamin.widawsky@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTP id B8722FAC16 for ; Thu, 2 Jan 2014 06:34:07 -0800 (PST) In-Reply-To: <1388555170-19936-1-git-send-email-benjamin.widawsky@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: intel-gfx-bounces@lists.freedesktop.org Errors-To: intel-gfx-bounces@lists.freedesktop.org To: Intel GFX Cc: Ben Widawsky , Ben Widawsky List-Id: intel-gfx@lists.freedesktop.org Ben Widawsky writes: > It makes all the code which calls into this function way too confusing. > > v2: Fix destroy IOCTL as well > callsite inside i915_gem_validate_context() and after it is called in i915_gem_do_execbuffer() are still confusing as they seem to expect NULL. Latter even tries to dig out error value from NULL. -- Mika > Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=72903 > Signed-off-by: Ben Widawsky > --- > drivers/gpu/drm/i915/i915_gem_context.c | 12 +++++++++--- > 1 file changed, 9 insertions(+), 3 deletions(-) > > diff --git a/drivers/gpu/drm/i915/i915_gem_context.c b/drivers/gpu/drm/i915/i915_gem_context.c > index a90a0a1..f3ac9a2 100644 > --- a/drivers/gpu/drm/i915/i915_gem_context.c > +++ b/drivers/gpu/drm/i915/i915_gem_context.c > @@ -524,10 +524,16 @@ void i915_gem_context_close(struct drm_device *dev, struct drm_file *file) > struct i915_hw_context * > i915_gem_context_get(struct drm_i915_file_private *file_priv, u32 id) > { > + struct i915_hw_context *ctx; > + > if (!HAS_HW_CONTEXTS(file_priv->dev_priv->dev)) > return file_priv->private_default_ctx; > > - return (struct i915_hw_context *)idr_find(&file_priv->context_idr, id); > + ctx = (struct i915_hw_context *)idr_find(&file_priv->context_idr, id); > + if (!ctx) > + return ERR_PTR(-ENOENT); > + > + return ctx; > } > > static inline int > @@ -774,9 +780,9 @@ int i915_gem_context_destroy_ioctl(struct drm_device *dev, void *data, > return ret; > > ctx = i915_gem_context_get(file_priv, args->ctx_id); > - if (!ctx) { > + if (IS_ERR(ctx)) { > mutex_unlock(&dev->struct_mutex); > - return -ENOENT; > + return PTR_ERR(ctx); > } > > idr_remove(&ctx->file_priv->context_idr, ctx->id); > -- > 1.8.5.2 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx