Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 814e9b57 authored by Chris Wilson's avatar Chris Wilson Committed by Daniel Vetter
Browse files

drm/i915: Move the conditional seqno query into the tracepoint 



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.

Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarRodrigo Vivi <rodrigo.vivi@gmail.com>
Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent e2d05a8b

drivers/gpu/drm/i915/i915_irq.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

drivers/gpu/drm/i915/i915_trace.h

+18 −3
Original line number Diff line number Diff line
@@ -319,9 +319,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,