From: Ben Widawsky Subject: Re: [PATCH 1/5] drm/i915: WARN_ON failed map_and_fenceable Date: Sat, 10 Aug 2013 10:17:39 -0700 Message-ID: <20130810171739.GA16899@bwidawsk.net> References: <1376111536-12461-1-git-send-email-benjamin.widawsky@intel.com> <20130810085830.GH31670@phenom.ffwll.local> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail.bwidawsk.net (bwidawsk.net [166.78.191.112]) by gabe.freedesktop.org (Postfix) with ESMTP id DCF53E60E1 for ; Sat, 10 Aug 2013 10:17:49 -0700 (PDT) Content-Disposition: inline In-Reply-To: <20130810085830.GH31670@phenom.ffwll.local> 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: Daniel Vetter Cc: Intel GFX , Ben Widawsky List-Id: intel-gfx@lists.freedesktop.org On Sat, Aug 10, 2013 at 10:58:30AM +0200, Daniel Vetter wrote: > On Fri, Aug 09, 2013 at 10:12:12PM -0700, Ben Widawsky wrote: > > I just noticed in our code we don't really check the assertion, and > > given some of the code I am changing in this area, I feel a WARN is very > > nice to have. > > > > Signed-off-by: Ben Widawsky > > --- > > drivers/gpu/drm/i915/i915_gem.c | 2 ++ > > 1 file changed, 2 insertions(+) > > > > diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c > > index 498ef8a..b91a7f0 100644 > > --- a/drivers/gpu/drm/i915/i915_gem.c > > +++ b/drivers/gpu/drm/i915/i915_gem.c > > @@ -3186,6 +3186,8 @@ search_free: > > if (i915_is_ggtt(vm)) > > obj->map_and_fenceable = mappable && fenceable; > > > > + WARN_ON(map_and_fenceable & !obj->map_and_fenceable); > > s/&/&&/ I think, although since both are bools it doesn't matter > correctness-wise. > -Daniel > You're absolutely right. It was a typo. Do you want resubmit, or can you fix while apply? -- Ben Widawsky, Intel Open Source Technology Center