Hi all,
After merging the drm-intel tree, today's linux-next build (x86_64 allmodconfig) failed like this:
In file included from include/trace/define_trace.h:90:0, from drivers/gpu/drm/i915/i915_trace.h:520, from drivers/gpu/drm/i915/i915_trace_points.c:12: drivers/gpu/drm/i915/./i915_trace.h: In function 'ftrace_raw_event_i915_gem_evict_vm': drivers/gpu/drm/i915/./i915_trace.h:246:22: error: 'dev' undeclared (first use in this function) __entry->dev = dev->primary->index; ^ include/trace/ftrace.h:574:4: note: in definition of macro 'DECLARE_EVENT_CLASS' { assign; } \ ^ include/trace/ftrace.h:36:9: note: in expansion of macro 'PARAMS' PARAMS(assign), \ ^ drivers/gpu/drm/i915/./i915_trace.h:236:1: note: in expansion of macro 'TRACE_EVENT' TRACE_EVENT(i915_gem_evict_vm, ^ drivers/gpu/drm/i915/./i915_trace.h:245:6: note: in expansion of macro 'TP_fast_assign' TP_fast_assign( ^ drivers/gpu/drm/i915/./i915_trace.h:246:22: note: each undeclared identifier is reported only once for each function it appears in __entry->dev = dev->primary->index; ^ include/trace/ftrace.h:574:4: note: in definition of macro 'DECLARE_EVENT_CLASS' { assign; } \ ^ include/trace/ftrace.h:36:9: note: in expansion of macro 'PARAMS' PARAMS(assign), \ ^ drivers/gpu/drm/i915/./i915_trace.h:236:1: note: in expansion of macro 'TRACE_EVENT' TRACE_EVENT(i915_gem_evict_vm, ^ drivers/gpu/drm/i915/./i915_trace.h:245:6: note: in expansion of macro 'TP_fast_assign' TP_fast_assign( ^ In file included from include/trace/define_trace.h:90:0, from drivers/gpu/drm/i915/i915_trace.h:520, from drivers/gpu/drm/i915/i915_trace_points.c:12: drivers/gpu/drm/i915/./i915_trace.h: In function 'perf_trace_i915_gem_evict_vm': drivers/gpu/drm/i915/./i915_trace.h:246:22: error: 'dev' undeclared (first use in this function) __entry->dev = dev->primary->index; ^ include/trace/ftrace.h:708:4: note: in definition of macro 'DECLARE_EVENT_CLASS' { assign; } \ ^ include/trace/ftrace.h:36:9: note: in expansion of macro 'PARAMS' PARAMS(assign), \ ^ drivers/gpu/drm/i915/./i915_trace.h:236:1: note: in expansion of macro 'TRACE_EVENT' TRACE_EVENT(i915_gem_evict_vm, ^ drivers/gpu/drm/i915/./i915_trace.h:245:6: note: in expansion of macro 'TP_fast_assign' TP_fast_assign( ^
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.
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; ),
On Tue, Mar 18, 2014 at 09:18:42PM -0400, Steven Rostedt wrote:
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.
I was about to send out the same fix when I saw this.
Reviewed-by: Ben Widawsky ben@bwidawsk.net
-- 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
On Wed, Mar 19, 2014 at 2:54 AM, Ben Widawsky ben@bwidawsk.net wrote:
On Tue, Mar 18, 2014 at 09:18:42PM -0400, Steven Rostedt wrote:
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.
I was about to send out the same fix when I saw this.
Reviewed-by: Ben Widawsky ben@bwidawsk.net
Just fixed this this morning before starting to read mail - my apologies the mess me pushing out a patch yesterday right before rushing out caused, really shouldn't be doing that ;-)
Cheers, Daniel
dri-devel@lists.freedesktop.org
-
Ben Widawsky -
Daniel Vetter -
Stephen Rothwell -
Steven Rostedt