From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: Re: [PATCH] drm/i915: Don't try to deref an unbound VMA Date: Thu, 18 Jul 2013 08:47:18 +0200 Message-ID: <20130718064718.GI4550@phenom.ffwll.local> References: <20130718001217.GE6210@cantiga.alporthouse.com> <1374114753-871-1-git-send-email-ben@bwidawsk.net> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail-ee0-f43.google.com (mail-ee0-f43.google.com [74.125.83.43]) by gabe.freedesktop.org (Postfix) with ESMTP id 17AFFE679C for ; Wed, 17 Jul 2013 23:47:17 -0700 (PDT) Received: by mail-ee0-f43.google.com with SMTP id l10so1479809eei.2 for ; Wed, 17 Jul 2013 23:47:17 -0700 (PDT) Content-Disposition: inline In-Reply-To: <1374114753-871-1-git-send-email-ben@bwidawsk.net> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org To: Ben Widawsky Cc: Intel GFX List-Id: intel-gfx@lists.freedesktop.org On Wed, Jul 17, 2013 at 07:32:33PM -0700, Ben Widawsky wrote: > This was actually correct in the original series, and is also fixed > later in the patch series, but was broken in this middle state. > > I'm not really certain how I didn't hit it sooner. > > This patch should be squashed into: > commit 8f588cfc349bbbd8ae62a13679b9efba41645064 > Author: Ben Widawsky > Date: Wed Jul 17 12:19:03 2013 -0700 > > drm/i915: Create VMAs > > CC: Chris Wilson > Signed-off-by: Ben Widawsky Squashed in, thanks for the quick fixup. -Daniel > --- > drivers/gpu/drm/i915/i915_gem.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c > index a9fa2bb..c9487bb 100644 > --- a/drivers/gpu/drm/i915/i915_gem.c > +++ b/drivers/gpu/drm/i915/i915_gem.c > @@ -3314,7 +3314,7 @@ int i915_gem_object_set_cache_level(struct drm_i915_gem_object *obj, > return -EBUSY; > } > > - if (!i915_gem_valid_gtt_space(dev, &vma->node, cache_level)) { > + if (vma && !i915_gem_valid_gtt_space(dev, &vma->node, cache_level)) { > ret = i915_gem_object_unbind(obj); > if (ret) > return ret; > -- > 1.8.3.3 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx -- Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch