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 <ben@xxxxxxxxxxxx> > > > --- > > > 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 _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/intel-gfx