diff options
author | Takashi Iwai <tiwai@suse.de> | 2010-06-02 14:18:06 +0200 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2010-06-02 14:18:06 +0200 |
commit | c7a441bba9de3b4e166b6a4449208bc906d70558 (patch) | |
tree | 346fdf11e464c8201a9aaa8abdd1c1b6dc4f86e0 /drivers/gpu/drm/i915/i915_trace.h | |
parent | ead54d878465291746c91c95749990d62742a6cf (diff) | |
parent | e4caa8bab3862a7694ab7c6dfede223227ad7fc5 (diff) | |
download | talos-op-linux-c7a441bba9de3b4e166b6a4449208bc906d70558.tar.gz talos-op-linux-c7a441bba9de3b4e166b6a4449208bc906d70558.zip |
Merge branch 'fix/hda' into for-linus
Diffstat (limited to 'drivers/gpu/drm/i915/i915_trace.h')
-rw-r--r-- | drivers/gpu/drm/i915/i915_trace.h | 24 |
1 files changed, 7 insertions, 17 deletions
diff --git a/drivers/gpu/drm/i915/i915_trace.h b/drivers/gpu/drm/i915/i915_trace.h index 9e4c45f68d6e..fab21760dd57 100644 --- a/drivers/gpu/drm/i915/i915_trace.h +++ b/drivers/gpu/drm/i915/i915_trace.h @@ -53,23 +53,6 @@ TRACE_EVENT(i915_gem_object_bind, __entry->obj, __entry->gtt_offset) ); -TRACE_EVENT(i915_gem_object_clflush, - - TP_PROTO(struct drm_gem_object *obj), - - TP_ARGS(obj), - - TP_STRUCT__entry( - __field(struct drm_gem_object *, obj) - ), - - TP_fast_assign( - __entry->obj = obj; - ), - - TP_printk("obj=%p", __entry->obj) -); - TRACE_EVENT(i915_gem_object_change_domain, TP_PROTO(struct drm_gem_object *obj, uint32_t old_read_domains, uint32_t old_write_domain), @@ -132,6 +115,13 @@ 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_gem_object *obj), + + TP_ARGS(obj) +); + DEFINE_EVENT(i915_gem_object, i915_gem_object_unbind, TP_PROTO(struct drm_gem_object *obj), |