From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758221AbaCSCEG (ORCPT ); Tue, 18 Mar 2014 22:04:06 -0400 Received: from bwidawsk.net ([166.78.191.112]:33861 "EHLO mail.bwidawsk.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757290AbaCSCEE (ORCPT ); Tue, 18 Mar 2014 22:04:04 -0400 X-Greylist: delayed 570 seconds by postgrey-1.27 at vger.kernel.org; Tue, 18 Mar 2014 22:04:04 EDT Date: Tue, 18 Mar 2014 18:54:15 -0700 From: Ben Widawsky To: Steven Rostedt Cc: Stephen Rothwell , Daniel Vetter , intel-gfx@lists.freedesktop.org, linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org Subject: Re: [Intel-gfx] linux-next: build failure after merge of the drm-intel tree Message-ID: <20140319015415.GD7956@bwidawsk.net> References: <20140319115350.7860f102a804a9975ba6e93d@canb.auug.org.au> <20140318211842.017be730@gandalf.local.home> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20140318211842.017be730@gandalf.local.home> User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, Mar 18, 2014 at 09:18:42PM -0400, Steven Rostedt wrote: > On Wed, 19 Mar 2014 11:53:50 +1100 > Stephen Rothwell wrote: > > > > Caused by commit a25ca17c1eac ("drm/i915: Do not dereference pointers > > from ring buffer in evict event"). > > > > I have used the drm-intel tree from next-20140318 for today. > > > > Bah! I'm still suffering from jet lag (just came back from Linux-Tage > in Chemnitz). > > The next time I compile test a patch for a module, I'll make sure I have > that module's config option set :-( The woe of using localmodconfig. I > should have picked the box with the i915. :-/ > > Below is the fix. I'll repost a v2 of the original patch. > > Sorry about that. > I was about to send out the same fix when I saw this. Reviewed-by: Ben Widawsky > -- Steve > > diff --git a/drivers/gpu/drm/i915/i915_trace.h b/drivers/gpu/drm/i915/i915_trace.h > index f3e8a90..783ae08 100644 > --- a/drivers/gpu/drm/i915/i915_trace.h > +++ b/drivers/gpu/drm/i915/i915_trace.h > @@ -243,7 +243,7 @@ TRACE_EVENT(i915_gem_evict_vm, > ), > > TP_fast_assign( > - __entry->dev = dev->primary->index; > + __entry->dev = vm->dev->primary->index; > __entry->vm = vm; > ), > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx -- Ben Widawsky, Intel Open Source Technology Center