From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
To: Jean Pihet <jean.pihet@newoldbits.com>
Cc: Jesse Barnes <jbarnes@virtuousgeek.org>,
LKML <linux-kernel@vger.kernel.org>,
Steven Rostedt <rostedt@goodmis.org>,
Thomas Gleixner <tglx@linutronix.de>,
Frederic Weisbecker <fweisbec@gmail.com>,
Ingo Molnar <mingo@elte.hu>, Dave Airlie <airlied@redhat.com>,
Chris Wilson <chris@chris-wilson.co.uk>,
Li Zefan <lizf@cn.fujitsu.com>
Subject: Re: [RFC patch 25/32] trace event video gpu remove semicolons
Date: Wed, 4 May 2011 09:33:05 -0400 [thread overview]
Message-ID: <20110504133304.GB10439@Krystal> (raw)
In-Reply-To: <BANLkTinJAeFY5fFOprvvj2nSkN8cKfGvXA@mail.gmail.com>
* Jean Pihet (jean.pihet@newoldbits.com) wrote:
[...]
> There are radeon specific trace points defined in
> drivers/gpu/drm/radeon/radeon_trace.h, which are not covered by this
> patch.
> Is it intentional?
No, it's not intentional. Here is the updated patch. Thanks for spotting
this! Please note that the current "Reviewed-by: Jesse Barnes" only
apply to the drm_trace.h and i915_trace.h portion of the patch.
Mathieu
trace event video gpu remove semicolons
Part of the gradual TRACE_EVENT() semicolon removal. Enables creation of array
of events, thus saving space for trace event probes.
* Changelog
- Take care of radeon_trace.h
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org>
CC: Steven Rostedt <rostedt@goodmis.org>
CC: Frederic Weisbecker <fweisbec@gmail.com>
CC: Ingo Molnar <mingo@elte.hu>
CC: Thomas Gleixner <tglx@linutronix.de>
CC: Dave Airlie <airlied@redhat.com>
CC: Chris Wilson <chris@chris-wilson.co.uk>
CC: Li Zefan <lizf@cn.fujitsu.com>
CC: Jean Pihet <jean.pihet@newoldbits.com>
---
drivers/gpu/drm/drm_trace.h | 6 +--
drivers/gpu/drm/i915/i915_trace.h | 52 +++++++++++++++++-----------------
drivers/gpu/drm/radeon/radeon_trace.h | 12 +++----
3 files changed, 35 insertions(+), 35 deletions(-)
Index: linux-2.6-lttng/drivers/gpu/drm/drm_trace.h
===================================================================
--- linux-2.6-lttng.orig/drivers/gpu/drm/drm_trace.h
+++ linux-2.6-lttng/drivers/gpu/drm/drm_trace.h
@@ -22,7 +22,7 @@ TRACE_EVENT(drm_vblank_event,
__entry->seq = seq;
),
TP_printk("crtc=%d, seq=%d", __entry->crtc, __entry->seq)
-);
+)
TRACE_EVENT(drm_vblank_event_queued,
TP_PROTO(pid_t pid, int crtc, unsigned int seq),
@@ -39,7 +39,7 @@ TRACE_EVENT(drm_vblank_event_queued,
),
TP_printk("pid=%d, crtc=%d, seq=%d", __entry->pid, __entry->crtc, \
__entry->seq)
-);
+)
TRACE_EVENT(drm_vblank_event_delivered,
TP_PROTO(pid_t pid, int crtc, unsigned int seq),
@@ -56,7 +56,7 @@ TRACE_EVENT(drm_vblank_event_delivered,
),
TP_printk("pid=%d, crtc=%d, seq=%d", __entry->pid, __entry->crtc, \
__entry->seq)
-);
+)
#endif /* _DRM_TRACE_H_ */
Index: linux-2.6-lttng/drivers/gpu/drm/i915/i915_trace.h
===================================================================
--- linux-2.6-lttng.orig/drivers/gpu/drm/i915/i915_trace.h
+++ linux-2.6-lttng/drivers/gpu/drm/i915/i915_trace.h
@@ -31,7 +31,7 @@ TRACE_EVENT(i915_gem_object_create,
),
TP_printk("obj=%p, size=%u", __entry->obj, __entry->size)
-);
+)
TRACE_EVENT(i915_gem_object_bind,
TP_PROTO(struct drm_i915_gem_object *obj, bool mappable),
@@ -54,7 +54,7 @@ TRACE_EVENT(i915_gem_object_bind,
TP_printk("obj=%p, offset=%08x size=%x%s",
__entry->obj, __entry->offset, __entry->size,
__entry->mappable ? ", mappable" : "")
-);
+)
TRACE_EVENT(i915_gem_object_unbind,
TP_PROTO(struct drm_i915_gem_object *obj),
@@ -74,7 +74,7 @@ TRACE_EVENT(i915_gem_object_unbind,
TP_printk("obj=%p, offset=%08x size=%x",
__entry->obj, __entry->offset, __entry->size)
-);
+)
TRACE_EVENT(i915_gem_object_change_domain,
TP_PROTO(struct drm_i915_gem_object *obj, u32 old_read, u32 old_write),
@@ -98,7 +98,7 @@ TRACE_EVENT(i915_gem_object_change_domai
__entry->read_domains & 0xffff,
__entry->write_domain >> 16,
__entry->write_domain & 0xffff)
-);
+)
TRACE_EVENT(i915_gem_object_pwrite,
TP_PROTO(struct drm_i915_gem_object *obj, u32 offset, u32 len),
@@ -118,7 +118,7 @@ TRACE_EVENT(i915_gem_object_pwrite,
TP_printk("obj=%p, offset=%u, len=%u",
__entry->obj, __entry->offset, __entry->len)
-);
+)
TRACE_EVENT(i915_gem_object_pread,
TP_PROTO(struct drm_i915_gem_object *obj, u32 offset, u32 len),
@@ -138,7 +138,7 @@ TRACE_EVENT(i915_gem_object_pread,
TP_printk("obj=%p, offset=%u, len=%u",
__entry->obj, __entry->offset, __entry->len)
-);
+)
TRACE_EVENT(i915_gem_object_fault,
TP_PROTO(struct drm_i915_gem_object *obj, u32 index, bool gtt, bool write),
@@ -163,7 +163,7 @@ TRACE_EVENT(i915_gem_object_fault,
__entry->gtt ? "GTT" : "CPU",
__entry->index,
__entry->write ? ", writable" : "")
-);
+)
DECLARE_EVENT_CLASS(i915_gem_object,
TP_PROTO(struct drm_i915_gem_object *obj),
@@ -178,17 +178,17 @@ DECLARE_EVENT_CLASS(i915_gem_object,
),
TP_printk("obj=%p", __entry->obj)
-);
+)
DEFINE_EVENT(i915_gem_object, i915_gem_object_clflush,
TP_PROTO(struct drm_i915_gem_object *obj),
TP_ARGS(obj)
-);
+)
DEFINE_EVENT(i915_gem_object, i915_gem_object_destroy,
TP_PROTO(struct drm_i915_gem_object *obj),
TP_ARGS(obj)
-);
+)
TRACE_EVENT(i915_gem_evict,
TP_PROTO(struct drm_device *dev, u32 size, u32 align, bool mappable),
@@ -211,7 +211,7 @@ TRACE_EVENT(i915_gem_evict,
TP_printk("dev=%d, size=%d, align=%d %s",
__entry->dev, __entry->size, __entry->align,
__entry->mappable ? ", mappable" : "")
-);
+)
TRACE_EVENT(i915_gem_evict_everything,
TP_PROTO(struct drm_device *dev, bool purgeable),
@@ -230,7 +230,7 @@ TRACE_EVENT(i915_gem_evict_everything,
TP_printk("dev=%d%s",
__entry->dev,
__entry->purgeable ? ", purgeable only" : "")
-);
+)
TRACE_EVENT(i915_gem_ring_dispatch,
TP_PROTO(struct intel_ring_buffer *ring, u32 seqno),
@@ -251,7 +251,7 @@ TRACE_EVENT(i915_gem_ring_dispatch,
TP_printk("dev=%u, ring=%u, seqno=%u",
__entry->dev, __entry->ring, __entry->seqno)
-);
+)
TRACE_EVENT(i915_gem_ring_flush,
TP_PROTO(struct intel_ring_buffer *ring, u32 invalidate, u32 flush),
@@ -274,7 +274,7 @@ TRACE_EVENT(i915_gem_ring_flush,
TP_printk("dev=%u, ring=%x, invalidate=%04x, flush=%04x",
__entry->dev, __entry->ring,
__entry->invalidate, __entry->flush)
-);
+)
DECLARE_EVENT_CLASS(i915_gem_request,
TP_PROTO(struct intel_ring_buffer *ring, u32 seqno),
@@ -294,32 +294,32 @@ DECLARE_EVENT_CLASS(i915_gem_request,
TP_printk("dev=%u, ring=%u, seqno=%u",
__entry->dev, __entry->ring, __entry->seqno)
-);
+)
DEFINE_EVENT(i915_gem_request, i915_gem_request_add,
TP_PROTO(struct intel_ring_buffer *ring, u32 seqno),
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)
-);
+)
DEFINE_EVENT(i915_gem_request, i915_gem_request_retire,
TP_PROTO(struct intel_ring_buffer *ring, u32 seqno),
TP_ARGS(ring, seqno)
-);
+)
DEFINE_EVENT(i915_gem_request, i915_gem_request_wait_begin,
TP_PROTO(struct intel_ring_buffer *ring, u32 seqno),
TP_ARGS(ring, seqno)
-);
+)
DEFINE_EVENT(i915_gem_request, i915_gem_request_wait_end,
TP_PROTO(struct intel_ring_buffer *ring, u32 seqno),
TP_ARGS(ring, seqno)
-);
+)
DECLARE_EVENT_CLASS(i915_ring,
TP_PROTO(struct intel_ring_buffer *ring),
@@ -336,17 +336,17 @@ DECLARE_EVENT_CLASS(i915_ring,
),
TP_printk("dev=%u, ring=%u", __entry->dev, __entry->ring)
-);
+)
DEFINE_EVENT(i915_ring, i915_ring_wait_begin,
TP_PROTO(struct intel_ring_buffer *ring),
TP_ARGS(ring)
-);
+)
DEFINE_EVENT(i915_ring, i915_ring_wait_end,
TP_PROTO(struct intel_ring_buffer *ring),
TP_ARGS(ring)
-);
+)
TRACE_EVENT(i915_flip_request,
TP_PROTO(int plane, struct drm_i915_gem_object *obj),
@@ -364,7 +364,7 @@ TRACE_EVENT(i915_flip_request,
),
TP_printk("plane=%d, obj=%p", __entry->plane, __entry->obj)
-);
+)
TRACE_EVENT(i915_flip_complete,
TP_PROTO(int plane, struct drm_i915_gem_object *obj),
@@ -382,7 +382,7 @@ TRACE_EVENT(i915_flip_complete,
),
TP_printk("plane=%d, obj=%p", __entry->plane, __entry->obj)
-);
+)
TRACE_EVENT(i915_reg_rw,
TP_PROTO(bool write, u32 reg, u64 val, int len),
@@ -408,7 +408,7 @@ TRACE_EVENT(i915_reg_rw,
__entry->reg, __entry->len,
(u32)(__entry->val & 0xffffffff),
(u32)(__entry->val >> 32))
-);
+)
#endif /* _I915_TRACE_H_ */
Index: linux-2.6-lttng/drivers/gpu/drm/radeon/radeon_trace.h
===================================================================
--- linux-2.6-lttng.orig/drivers/gpu/drm/radeon/radeon_trace.h
+++ linux-2.6-lttng/drivers/gpu/drm/radeon/radeon_trace.h
@@ -25,7 +25,7 @@ TRACE_EVENT(radeon_bo_create,
__entry->pages = bo->tbo.num_pages;
),
TP_printk("bo=%p, pages=%u", __entry->bo, __entry->pages)
-);
+)
DECLARE_EVENT_CLASS(radeon_fence_request,
@@ -44,35 +44,35 @@ DECLARE_EVENT_CLASS(radeon_fence_request
),
TP_printk("dev=%u, seqno=%u", __entry->dev, __entry->seqno)
-);
+)
DEFINE_EVENT(radeon_fence_request, radeon_fence_emit,
TP_PROTO(struct drm_device *dev, u32 seqno),
TP_ARGS(dev, seqno)
-);
+)
DEFINE_EVENT(radeon_fence_request, radeon_fence_retire,
TP_PROTO(struct drm_device *dev, u32 seqno),
TP_ARGS(dev, seqno)
-);
+)
DEFINE_EVENT(radeon_fence_request, radeon_fence_wait_begin,
TP_PROTO(struct drm_device *dev, u32 seqno),
TP_ARGS(dev, seqno)
-);
+)
DEFINE_EVENT(radeon_fence_request, radeon_fence_wait_end,
TP_PROTO(struct drm_device *dev, u32 seqno),
TP_ARGS(dev, seqno)
-);
+)
#endif
--
Mathieu Desnoyers
Operating System Efficiency R&D Consultant
EfficiOS Inc.
http://www.efficios.com
next prev parent reply other threads:[~2011-05-04 13:33 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-05-03 23:10 [RFC patch 00/32] TRACE_EVENT: cleanup for code-size reduction (v2) Mathieu Desnoyers
2011-05-03 23:10 ` [RFC patch 01/32] TRACE_EVENT: gradual semicolon removal Mathieu Desnoyers
2011-05-03 23:10 ` [RFC patch 02/32] trace event sample remove semicolons Mathieu Desnoyers
2011-05-03 23:10 ` [RFC patch 03/32] trace event block " Mathieu Desnoyers
2011-05-03 23:10 ` [RFC patch 04/32] trace event ext4 " Mathieu Desnoyers
2011-05-03 23:10 ` [RFC patch 05/32] trace event irq " Mathieu Desnoyers
2011-05-03 23:10 ` [RFC patch 06/32] trace event jbd2 " Mathieu Desnoyers
2011-05-03 23:10 ` [RFC patch 07/32] trace event kmem " Mathieu Desnoyers
2011-05-03 23:10 ` [RFC patch 08/32] trace event kvm " Mathieu Desnoyers
2011-05-03 23:10 ` [RFC patch 09/32] trace event lock " Mathieu Desnoyers
2011-05-03 23:10 ` [RFC patch 10/32] trace event mce " Mathieu Desnoyers
2011-05-03 23:10 ` [RFC patch 11/32] trace event module " Mathieu Desnoyers
2011-05-03 23:10 ` [RFC patch 12/32] trace event napi " Mathieu Desnoyers
2011-05-03 23:10 ` [RFC patch 13/32] trace event net " Mathieu Desnoyers
2011-05-03 23:10 ` [RFC patch 14/32] trace event power " Mathieu Desnoyers
2011-05-03 23:10 ` [RFC patch 15/32] trace event sched remove trailing semicolon Mathieu Desnoyers
2011-05-03 23:10 ` [RFC patch 16/32] trace event scsi remove semicolons Mathieu Desnoyers
2011-05-03 23:10 ` [RFC patch 17/32] trace event signal " Mathieu Desnoyers
2011-05-03 23:10 ` [RFC patch 18/32] trace event skb " Mathieu Desnoyers
2011-05-03 23:10 ` [RFC patch 19/32] trace event syscalls " Mathieu Desnoyers
2011-05-03 23:10 ` [RFC patch 20/32] trace event timer " Mathieu Desnoyers
2011-05-03 23:10 ` [RFC patch 21/32] trace event vmscan " Mathieu Desnoyers
2011-05-03 23:10 ` [RFC patch 22/32] trace event workqueue " Mathieu Desnoyers
2011-05-03 23:10 ` [RFC patch 23/32] trace event writeback " Mathieu Desnoyers
2011-05-03 23:10 ` [RFC patch 24/32] trace event wireless " Mathieu Desnoyers
2011-05-03 23:10 ` [RFC patch 25/32] trace event video gpu " Mathieu Desnoyers
2011-05-04 0:21 ` Jesse Barnes
2011-05-04 1:51 ` Mathieu Desnoyers
2011-05-04 8:49 ` Jean Pihet
2011-05-04 13:33 ` Mathieu Desnoyers [this message]
2011-05-03 23:10 ` [RFC patch 26/32] trace event gfs2 " Mathieu Desnoyers
2011-05-03 23:10 ` [RFC patch 27/32] trace event xfs " Mathieu Desnoyers
2011-05-03 23:10 ` [RFC patch 28/32] trace event powerpc " Mathieu Desnoyers
2011-05-03 23:10 ` [RFC patch 29/32] trace event asoc: semicolon removal Mathieu Desnoyers
2011-05-03 23:10 ` [RFC patch 30/32] trace event compaction remove semicolons Mathieu Desnoyers
2011-05-03 23:10 ` [RFC patch 31/32] trace event regulator " Mathieu Desnoyers
2011-05-04 8:56 ` Mark Brown
2011-05-03 23:10 ` [RFC patch 32/32] trace event btrfs " Mathieu Desnoyers
-- strict thread matches above, loose matches on Subject: below --
2011-05-02 21:11 [RFC patch 00/32] TRACE_EVENT: cleanup for code-size reduction Mathieu Desnoyers
2011-05-02 21:11 ` [RFC patch 25/32] trace event video gpu remove semicolons Mathieu Desnoyers
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20110504133304.GB10439@Krystal \
--to=mathieu.desnoyers@efficios.com \
--cc=airlied@redhat.com \
--cc=chris@chris-wilson.co.uk \
--cc=fweisbec@gmail.com \
--cc=jbarnes@virtuousgeek.org \
--cc=jean.pihet@newoldbits.com \
--cc=linux-kernel@vger.kernel.org \
--cc=lizf@cn.fujitsu.com \
--cc=mingo@elte.hu \
--cc=rostedt@goodmis.org \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.