From: Daniel Vetter Subject: Re: [PATCH 1/5] drm/i915: WARN_ON failed map_and_fenceable Date: Sat, 10 Aug 2013 20:05:30 +0200 Message-ID: <20130810180530.GM31670@phenom.ffwll.local> References: <1376111536-12461-1-git-send-email-benjamin.widawsky@intel.com> <20130810085830.GH31670@phenom.ffwll.local> <20130810171739.GA16899@bwidawsk.net> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail-ea0-f172.google.com (mail-ea0-f172.google.com [209.85.215.172]) by gabe.freedesktop.org (Postfix) with ESMTP id EE089E5CE7 for ; Sat, 10 Aug 2013 11:05:23 -0700 (PDT) Received: by mail-ea0-f172.google.com with SMTP id r16so2659222ead.31 for ; Sat, 10 Aug 2013 11:05:22 -0700 (PDT) Content-Disposition: inline In-Reply-To: <20130810171739.GA16899@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 , Ben Widawsky List-Id: intel-gfx@lists.freedesktop.org On Sat, Aug 10, 2013 at 10:17:39AM -0700, Ben Widawsky wrote: > 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? Fixed and applied, thanks for the patch. -Daniel -- Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch