From patchwork Wed Mar 19 01:18:42 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 3850081 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id B1A3A9F334 for ; Wed, 19 Mar 2014 01:18:48 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D62E32034E for ; Wed, 19 Mar 2014 01:18:47 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 143A2202EB for ; Wed, 19 Mar 2014 01:18:46 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id A35506EC6B; Tue, 18 Mar 2014 18:18:45 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from cdptpa-oedge-vip.email.rr.com (cdptpa-outbound-snat.email.rr.com [107.14.166.226]) by gabe.freedesktop.org (Postfix) with ESMTP id 780996EC6B for ; Tue, 18 Mar 2014 18:18:44 -0700 (PDT) Received: from [67.255.60.225] ([67.255.60.225:51476] helo=gandalf.local.home) by cdptpa-oedge01 (envelope-from ) (ecelerity 3.5.0.35861 r(Momo-dev:tip)) with ESMTP id EC/A3-21197-270F8235; Wed, 19 Mar 2014 01:18:43 +0000 Date: Tue, 18 Mar 2014 21:18:42 -0400 From: Steven Rostedt To: Stephen Rothwell Message-ID: <20140318211842.017be730@gandalf.local.home> In-Reply-To: <20140319115350.7860f102a804a9975ba6e93d@canb.auug.org.au> References: <20140319115350.7860f102a804a9975ba6e93d@canb.auug.org.au> X-Mailer: Claws Mail 3.9.3 (GTK+ 2.24.22; x86_64-pc-linux-gnu) MIME-Version: 1.0 X-RR-Connecting-IP: 107.14.168.118:25 X-Cloudmark-Score: 0 Cc: 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 X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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. -- Steve Reviewed-by: Ben Widawsky 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; ),