Messages in this thread Patch in this message | | | Date | Tue, 18 Mar 2014 21:18:42 -0400 | From | Steven Rostedt <> | Subject | Re: linux-next: build failure after merge of the drm-intel tree |
| |
On Wed, 19 Mar 2014 11:53:50 +1100 Stephen Rothwell <sfr@canb.auug.org.au> 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
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; ),
| |