| From d841118ac80c5bfb18f47984bc40687eed08b714 Mon Sep 17 00:00:00 2001 |
| From: Sebastian Andrzej Siewior <bigeasy@linutronix.de> |
| Date: Thu, 25 Apr 2013 18:12:52 +0200 |
| Subject: [PATCH 1/5] drm/i915: move i915_trace_irq_get() out of the tracing |
| macro |
| |
| Reported-by: Joakim Hernberg <jbh@alchemy.lu> |
| Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> |
| --- |
| drivers/gpu/drm/i915/i915_gem_execbuffer.c | 1 + |
| drivers/gpu/drm/i915/i915_trace.h | 1 - |
| drivers/gpu/drm/i915/intel_ringbuffer.h | 2 ++ |
| 3 files changed, 3 insertions(+), 1 deletion(-) |
| |
| --- a/drivers/gpu/drm/i915/i915_gem_execbuffer.c |
| +++ b/drivers/gpu/drm/i915/i915_gem_execbuffer.c |
| @@ -1069,6 +1069,7 @@ i915_gem_do_execbuffer(struct drm_device |
| } |
| |
| trace_i915_gem_ring_dispatch(ring, intel_ring_get_seqno(ring), flags); |
| + i915_trace_irq_get(ring, seqno); |
| |
| i915_gem_execbuffer_move_to_active(&objects, ring); |
| i915_gem_execbuffer_retire_commands(dev, file, ring); |
| --- a/drivers/gpu/drm/i915/i915_trace.h |
| +++ b/drivers/gpu/drm/i915/i915_trace.h |
| @@ -244,7 +244,6 @@ TRACE_EVENT(i915_gem_ring_dispatch, |
| __entry->ring = ring->id; |
| __entry->seqno = seqno; |
| __entry->flags = flags; |
| - i915_trace_irq_get(ring, seqno); |
| ), |
| |
| TP_printk("dev=%u, ring=%u, seqno=%u, flags=%x", |
| --- a/drivers/gpu/drm/i915/intel_ringbuffer.h |
| +++ b/drivers/gpu/drm/i915/intel_ringbuffer.h |
| @@ -232,8 +232,10 @@ static inline u32 intel_ring_get_seqno(s |
| |
| static inline void i915_trace_irq_get(struct intel_ring_buffer *ring, u32 seqno) |
| { |
| +#ifdef CONFIG_TRACEPOINTS |
| if (ring->trace_irq_seqno == 0 && ring->irq_get(ring)) |
| ring->trace_irq_seqno = seqno; |
| +#endif |
| } |
| |
| /* DRI warts */ |
