On Mon, Sep 23, 2013 at 05:33:19PM -0300, Rodrigo Vivi wrote:
> From: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx>
>
> We only wish to know the value of seqno when emitting the tracepoint, so
> move the query from a parameter to the macro to inside the conditional
> macro body so that the query is only evaluated when required.
>
> Reviewer: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
> Signed-off-by: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx>
> Signed-off-by: Rodrigo Vivi <rodrigo.vivi@xxxxxxxxx>
Looks OK to me.
Reviewed-by: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
> ---
> drivers/gpu/drm/i915/i915_irq.c | 2 +-
> drivers/gpu/drm/i915/i915_trace.h | 21 ++++++++++++++++++---
> 2 files changed, 19 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
> index b356dc1..84b7efc 100644
> --- a/drivers/gpu/drm/i915/i915_irq.c
> +++ b/drivers/gpu/drm/i915/i915_irq.c
> @@ -807,7 +807,7 @@ static void notify_ring(struct drm_device *dev,
> if (ring->obj == NULL)
> return;
>
> - trace_i915_gem_request_complete(ring, ring->get_seqno(ring, false));
> + trace_i915_gem_request_complete(ring);
>
> wake_up_all(&ring->irq_queue);
> i915_queue_hangcheck(dev);
> diff --git a/drivers/gpu/drm/i915/i915_trace.h b/drivers/gpu/drm/i915/i915_trace.h
> index e2c5ee6..a1797f6 100644
> --- a/drivers/gpu/drm/i915/i915_trace.h
> +++ b/drivers/gpu/drm/i915/i915_trace.h
> @@ -304,9 +304,24 @@ DEFINE_EVENT(i915_gem_request, i915_gem_request_add,
> TP_ARGS(ring, seqno)
> );
>
> -DEFINE_EVENT(i915_gem_request, i915_gem_request_complete,
> - TP_PROTO(struct intel_ring_buffer *ring, u32 seqno),
> - TP_ARGS(ring, seqno)
> +TRACE_EVENT(i915_gem_request_complete,
> + TP_PROTO(struct intel_ring_buffer *ring),
> + TP_ARGS(ring),
> +
> + TP_STRUCT__entry(
> + __field(u32, dev)
> + __field(u32, ring)
> + __field(u32, seqno)
> + ),
> +
> + TP_fast_assign(
> + __entry->dev = ring->dev->primary->index;
> + __entry->ring = ring->id;
> + __entry->seqno = ring->get_seqno(ring, false);
> + ),
> +
> + TP_printk("dev=%u, ring=%u, seqno=%u",
> + __entry->dev, __entry->ring, __entry->seqno)
> );
>
> DEFINE_EVENT(i915_gem_request, i915_gem_request_retire,
> --
> 1.8.1.4
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Ville Syrjälä
Intel OTC
_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
