From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= Subject: Re: [PATCH 02/13] drm/i915: Move the conditional seqno query into the tracepoint Date: Tue, 24 Sep 2013 21:50:58 +0300 Message-ID: <20130924185058.GG4531@intel.com> References: <1379968410-14428-1-git-send-email-rodrigo.vivi@gmail.com> <1379968410-14428-3-git-send-email-rodrigo.vivi@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Return-path: Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTP id 4A785E60AD for ; Tue, 24 Sep 2013 11:51:04 -0700 (PDT) Content-Disposition: inline In-Reply-To: <1379968410-14428-3-git-send-email-rodrigo.vivi@gmail.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org To: Rodrigo Vivi Cc: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org On Mon, Sep 23, 2013 at 05:33:19PM -0300, Rodrigo Vivi wrote: > From: Chris Wilson > = > 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=E4l=E4 > Signed-off-by: Chris Wilson > Signed-off-by: Rodrigo Vivi Looks OK to me. Reviewed-by: Ville Syrj=E4l=E4 > --- > 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 =3D=3D 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/i91= 5_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 =3D ring->dev->primary->index; > + __entry->ring =3D ring->id; > + __entry->seqno =3D ring->get_seqno(ring, false); > + ), > + > + TP_printk("dev=3D%u, ring=3D%u, seqno=3D%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@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx -- = Ville Syrj=E4l=E4 Intel OTC