Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus

[sfrench/cifs-2.6.git] / drivers / gpu / drm / i915 / i915_trace.h

diff --git a/drivers/gpu/drm/i915/i915_trace.h b/drivers/gpu/drm/i915/i915_trace.h
index 01840d9bc38fa8b58401841caf795301beb8b795..9e4c45f68d6edd2af9812cef1c5fc89453e52f55 100644 (file)
--- a/drivers/gpu/drm/i915/i915_trace.h
+++ b/drivers/gpu/drm/i915/i915_trace.h
@@ -115,7 +115,7 @@ TRACE_EVENT(i915_gem_object_get_fence,
                      __entry->obj, __entry->fence, __entry->tiling_mode)
 );
 
-TRACE_EVENT(i915_gem_object_unbind,
+DECLARE_EVENT_CLASS(i915_gem_object,
 
            TP_PROTO(struct drm_gem_object *obj),
 
@@ -132,21 +132,18 @@ TRACE_EVENT(i915_gem_object_unbind,
            TP_printk("obj=%p", __entry->obj)
 );
 
-TRACE_EVENT(i915_gem_object_destroy,
+DEFINE_EVENT(i915_gem_object, i915_gem_object_unbind,
 
            TP_PROTO(struct drm_gem_object *obj),
 
-           TP_ARGS(obj),
+           TP_ARGS(obj)
+);
 
-           TP_STRUCT__entry(
-                            __field(struct drm_gem_object *, obj)
-                            ),
+DEFINE_EVENT(i915_gem_object, i915_gem_object_destroy,
 
-           TP_fast_assign(
-                          __entry->obj = obj;
-                          ),
+           TP_PROTO(struct drm_gem_object *obj),
 
-           TP_printk("obj=%p", __entry->obj)
+           TP_ARGS(obj)
 );
 
 /* batch tracing */
@@ -197,8 +194,7 @@ TRACE_EVENT(i915_gem_request_flush,
                      __entry->flush_domains, __entry->invalidate_domains)
 );
 
-
-TRACE_EVENT(i915_gem_request_complete,
+DECLARE_EVENT_CLASS(i915_gem_request,
 
            TP_PROTO(struct drm_device *dev, u32 seqno),
 
@@ -217,64 +213,35 @@ TRACE_EVENT(i915_gem_request_complete,
            TP_printk("dev=%u, seqno=%u", __entry->dev, __entry->seqno)
 );
 
-TRACE_EVENT(i915_gem_request_retire,
+DEFINE_EVENT(i915_gem_request, i915_gem_request_complete,
 
            TP_PROTO(struct drm_device *dev, u32 seqno),
 
-           TP_ARGS(dev, seqno),
-
-           TP_STRUCT__entry(
-                            __field(u32, dev)
-                            __field(u32, seqno)
-                            ),
-
-           TP_fast_assign(
-                          __entry->dev = dev->primary->index;
-                          __entry->seqno = seqno;
-                          ),
-
-           TP_printk("dev=%u, seqno=%u", __entry->dev, __entry->seqno)
+           TP_ARGS(dev, seqno)
 );
 
-TRACE_EVENT(i915_gem_request_wait_begin,
+DEFINE_EVENT(i915_gem_request, i915_gem_request_retire,
 
            TP_PROTO(struct drm_device *dev, u32 seqno),
 
-           TP_ARGS(dev, seqno),
-
-           TP_STRUCT__entry(
-                            __field(u32, dev)
-                            __field(u32, seqno)
-                            ),
-
-           TP_fast_assign(
-                          __entry->dev = dev->primary->index;
-                          __entry->seqno = seqno;
-                          ),
-
-           TP_printk("dev=%u, seqno=%u", __entry->dev, __entry->seqno)
+           TP_ARGS(dev, seqno)
 );
 
-TRACE_EVENT(i915_gem_request_wait_end,
+DEFINE_EVENT(i915_gem_request, i915_gem_request_wait_begin,
 
            TP_PROTO(struct drm_device *dev, u32 seqno),
 
-           TP_ARGS(dev, seqno),
+           TP_ARGS(dev, seqno)
+);
 
-           TP_STRUCT__entry(
-                            __field(u32, dev)
-                            __field(u32, seqno)
-                            ),
+DEFINE_EVENT(i915_gem_request, i915_gem_request_wait_end,
 
-           TP_fast_assign(
-                          __entry->dev = dev->primary->index;
-                          __entry->seqno = seqno;
-                          ),
+           TP_PROTO(struct drm_device *dev, u32 seqno),
 
-           TP_printk("dev=%u, seqno=%u", __entry->dev, __entry->seqno)
+           TP_ARGS(dev, seqno)
 );
 
-TRACE_EVENT(i915_ring_wait_begin,
+DECLARE_EVENT_CLASS(i915_ring,
 
            TP_PROTO(struct drm_device *dev),
 
@@ -291,26 +258,23 @@ TRACE_EVENT(i915_ring_wait_begin,
            TP_printk("dev=%u", __entry->dev)
 );
 
-TRACE_EVENT(i915_ring_wait_end,
+DEFINE_EVENT(i915_ring, i915_ring_wait_begin,
 
            TP_PROTO(struct drm_device *dev),
 
-           TP_ARGS(dev),
+           TP_ARGS(dev)
+);
 
-           TP_STRUCT__entry(
-                            __field(u32, dev)
-                            ),
+DEFINE_EVENT(i915_ring, i915_ring_wait_end,
 
-           TP_fast_assign(
-                          __entry->dev = dev->primary->index;
-                          ),
+           TP_PROTO(struct drm_device *dev),
 
-           TP_printk("dev=%u", __entry->dev)
+           TP_ARGS(dev)
 );
 
 #endif /* _I915_TRACE_H_ */
 
 /* This part must be outside protection */
 #undef TRACE_INCLUDE_PATH
-#define TRACE_INCLUDE_PATH ../../drivers/gpu/drm/i915
+#define TRACE_INCLUDE_PATH .
 #include <trace/define_trace.h>