define and use trace macros
authorjsg <jsg@openbsd.org>
Sat, 18 Apr 2015 11:41:28 +0000 (11:41 +0000)
committerjsg <jsg@openbsd.org>
Sat, 18 Apr 2015 11:41:28 +0000 (11:41 +0000)
discussed with kettenis

sys/dev/pci/drm/drm_linux.h
sys/dev/pci/drm/i915/i915_drv.c
sys/dev/pci/drm/i915/i915_drv.h
sys/dev/pci/drm/i915/i915_gem.c
sys/dev/pci/drm/i915/i915_trace.h
sys/dev/pci/drm/i915/intel_pm.c
sys/dev/pci/drm/radeon/radeon_fence.c
sys/dev/pci/drm/radeon/radeon_object.c
sys/dev/pci/drm/radeon/radeon_semaphore.c
sys/dev/pci/drm/radeon/radeon_trace.h

index b2f20c0..571b5a1 100644 (file)
@@ -1,4 +1,4 @@
-/*     $OpenBSD: drm_linux.h,v 1.25 2015/04/18 11:05:32 jsg Exp $      */
+/*     $OpenBSD: drm_linux.h,v 1.26 2015/04/18 11:41:28 jsg Exp $      */
 /*
  * Copyright (c) 2013, 2014 Mark Kettenis
  *
@@ -176,6 +176,17 @@ do {                                                                       \
        unlikely(__ret);                                                \
 })
 
+#define TP_PROTO(x...) x
+
+#define DEFINE_EVENT(template, name, proto, args) \
+static inline void trace_##name(proto) {}
+
+#define TRACE_EVENT(name, proto, args, struct, assign, print) \
+static inline void trace_##name(proto) {}
+
+#define DECLARE_EVENT_CLASS(name, proto, args, tstruct, assign, print) \
+static inline void trace_##name(proto) {}
+
 #define IS_ERR_VALUE(x) unlikely((x) >= (unsigned long)-ELAST)
 
 static inline void *
index 17c2e8e..a71a13b 100644 (file)
@@ -1,4 +1,4 @@
-/* $OpenBSD: i915_drv.c,v 1.81 2015/04/18 11:21:12 jsg Exp $ */
+/* $OpenBSD: i915_drv.c,v 1.82 2015/04/18 11:41:28 jsg Exp $ */
 /*
  * Copyright (c) 2008-2009 Owain G. Ainsworth <oga@openbsd.org>
  *
@@ -49,8 +49,8 @@
 #include <dev/pci/drm/drm.h>
 #include <dev/pci/drm/i915_drm.h>
 #include "i915_drv.h"
-#include "intel_drv.h"
 #include "i915_trace.h"
+#include "intel_drv.h"
 
 #include <machine/pmap.h>
 
index 5fa4dda..ecec03e 100644 (file)
@@ -1,4 +1,4 @@
-/* $OpenBSD: i915_drv.h,v 1.61 2015/04/17 00:54:42 jsg Exp $ */
+/* $OpenBSD: i915_drv.h,v 1.62 2015/04/18 11:41:28 jsg Exp $ */
 /* i915_drv.h -- Private header for the I915 driver -*- linux-c -*-
  */
 /*
@@ -1339,6 +1339,8 @@ struct drm_i915_file_private {
 
 #define GT_FREQUENCY_MULTIPLIER 50
 
+#include "i915_trace.h"
+
 /**
  * RC6 is a special power stage which allows the GPU to enter an very
  * low-voltage mode when idle, using down to 0V while at this stage.  This
index e9609eb..4e5f451 100644 (file)
@@ -1,4 +1,4 @@
-/*     $OpenBSD: i915_gem.c,v 1.92 2015/04/17 00:54:42 jsg Exp $       */
+/*     $OpenBSD: i915_gem.c,v 1.93 2015/04/18 11:41:28 jsg Exp $       */
 /*
  * Copyright (c) 2008-2009 Owain G. Ainsworth <oga@openbsd.org>
  *
@@ -3200,9 +3200,9 @@ i915_gem_clflush_object(struct drm_i915_gem_object *obj)
        if (obj->cache_level != I915_CACHE_NONE)
                return;
 
-#if 0
        trace_i915_gem_object_clflush(obj);
 
+#if 0
        drm_clflush_sg(obj->pages);
 #else
 {
index 1bffe65..b381f7a 100644 (file)
-/*     $OpenBSD: i915_trace.h,v 1.11 2015/04/12 17:10:07 kettenis Exp $        */
-/*
- * Copyright (c) 2013 Mark Kettenis <kettenis@openbsd.org>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-static inline void
-trace_i915_gem_object_create(struct drm_i915_gem_object *obj)
-{
-}
-
-static inline void
-trace_i915_gem_object_destroy(struct drm_i915_gem_object *obj)
-{
-}
-
-static inline void
-trace_i915_gem_request_add(struct intel_ring_buffer *ring, u32 seqno)
-{
-}
-
-static inline void
-trace_i915_gem_request_complete(struct intel_ring_buffer *ring, u32 seqno)
-{
-}
-
-static inline void
-trace_i915_gem_request_retire(struct intel_ring_buffer *ring, u32 seqno)
-{
-}
-
-static inline void
-trace_i915_gem_request_wait_begin(struct intel_ring_buffer *ring, u32 seqno)
-{
-}
-
-static inline void
-trace_i915_gem_request_wait_end(struct intel_ring_buffer *ring, u32 seqno)
-{
-}
-
-static inline void
-trace_i915_ring_wait_begin(struct intel_ring_buffer *ring)
-{
-}
-
-static inline void
-trace_i915_ring_wait_end(struct intel_ring_buffer *ring)
-{
-}
-
-static inline void
-trace_i915_flip_request(int plane, struct drm_i915_gem_object *obj)
-{
-}
-
-static inline void
-trace_i915_flip_complete(int plane, struct drm_i915_gem_object *obj)
-{
-}
-
-static inline void
-trace_i915_gem_object_change_domain(struct drm_i915_gem_object *obj,
-                                   u32 old_read, u32 old_write)
-{
-}
-
-static inline void
-trace_i915_gem_object_pwrite(struct drm_i915_gem_object *obj,
-                            u32 offset, u32 len)
-{
-}
-
-static inline void
-trace_i915_gem_object_pread(struct drm_i915_gem_object *obj,
-                           u32 offset, u32 len)
-{
-}
-
-static inline void
-trace_i915_gem_object_bind(struct drm_i915_gem_object *obj, bool mappable)
-{
-}
-
-static inline void
-trace_i915_gem_object_unbind(struct drm_i915_gem_object *obj)
-{
-}
-
-static inline void
-trace_i915_reg_rw(bool write, u32 reg, u64 val, int len)
-{
-}
-
-static inline void
-trace_i915_gem_evict(struct drm_device *dev, u32 size, u32 align, bool mappable)
-{
-}
-
-static inline void
-trace_i915_gem_evict_everything(struct drm_device *dev)
-{
-}
-
-static inline void
-trace_i915_gem_ring_dispatch(struct intel_ring_buffer *ring, u32 seqno,
-                            u32 flags)
-{
-}
-
-static inline void
-trace_i915_gem_ring_flush(struct intel_ring_buffer *ring, u32 invalidate,
-                            u32 flush)
-{
-}
+/*     $OpenBSD: i915_trace.h,v 1.12 2015/04/18 11:41:28 jsg Exp $     */
+#if !defined(_I915_TRACE_H_) || defined(TRACE_HEADER_MULTI_READ)
+#define _I915_TRACE_H_
+
+#include <dev/pci/drm/drmP.h>
+#include "i915_drv.h"
+#include "intel_ringbuffer.h"
+
+#undef TRACE_SYSTEM
+#define TRACE_SYSTEM i915
+#define TRACE_SYSTEM_STRING __stringify(TRACE_SYSTEM)
+#define TRACE_INCLUDE_FILE i915_trace
+
+/* object tracking */
+
+TRACE_EVENT(i915_gem_object_create,
+           TP_PROTO(struct drm_i915_gem_object *obj),
+           TP_ARGS(obj),
+
+           TP_STRUCT__entry(
+                            __field(struct drm_i915_gem_object *, obj)
+                            __field(u32, size)
+                            ),
+
+           TP_fast_assign(
+                          __entry->obj = obj;
+                          __entry->size = obj->base.size;
+                          ),
+
+           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),
+           TP_ARGS(obj, mappable),
+
+           TP_STRUCT__entry(
+                            __field(struct drm_i915_gem_object *, obj)
+                            __field(u32, offset)
+                            __field(u32, size)
+                            __field(bool, mappable)
+                            ),
+
+           TP_fast_assign(
+                          __entry->obj = obj;
+                          __entry->offset = obj->gtt_space->start;
+                          __entry->size = obj->gtt_space->size;
+                          __entry->mappable = mappable;
+                          ),
+
+           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),
+           TP_ARGS(obj),
+
+           TP_STRUCT__entry(
+                            __field(struct drm_i915_gem_object *, obj)
+                            __field(u32, offset)
+                            __field(u32, size)
+                            ),
+
+           TP_fast_assign(
+                          __entry->obj = obj;
+                          __entry->offset = obj->gtt_space->start;
+                          __entry->size = obj->gtt_space->size;
+                          ),
+
+           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),
+           TP_ARGS(obj, old_read, old_write),
+
+           TP_STRUCT__entry(
+                            __field(struct drm_i915_gem_object *, obj)
+                            __field(u32, read_domains)
+                            __field(u32, write_domain)
+                            ),
+
+           TP_fast_assign(
+                          __entry->obj = obj;
+                          __entry->read_domains = obj->base.read_domains | (old_read << 16);
+                          __entry->write_domain = obj->base.write_domain | (old_write << 16);
+                          ),
+
+           TP_printk("obj=%p, read=%02x=>%02x, write=%02x=>%02x",
+                     __entry->obj,
+                     __entry->read_domains >> 16,
+                     __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),
+           TP_ARGS(obj, offset, len),
+
+           TP_STRUCT__entry(
+                            __field(struct drm_i915_gem_object *, obj)
+                            __field(u32, offset)
+                            __field(u32, len)
+                            ),
+
+           TP_fast_assign(
+                          __entry->obj = obj;
+                          __entry->offset = offset;
+                          __entry->len = len;
+                          ),
+
+           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),
+           TP_ARGS(obj, offset, len),
+
+           TP_STRUCT__entry(
+                            __field(struct drm_i915_gem_object *, obj)
+                            __field(u32, offset)
+                            __field(u32, len)
+                            ),
+
+           TP_fast_assign(
+                          __entry->obj = obj;
+                          __entry->offset = offset;
+                          __entry->len = len;
+                          ),
+
+           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),
+           TP_ARGS(obj, index, gtt, write),
+
+           TP_STRUCT__entry(
+                            __field(struct drm_i915_gem_object *, obj)
+                            __field(u32, index)
+                            __field(bool, gtt)
+                            __field(bool, write)
+                            ),
+
+           TP_fast_assign(
+                          __entry->obj = obj;
+                          __entry->index = index;
+                          __entry->gtt = gtt;
+                          __entry->write = write;
+                          ),
+
+           TP_printk("obj=%p, %s index=%u %s",
+                     __entry->obj,
+                     __entry->gtt ? "GTT" : "CPU",
+                     __entry->index,
+                     __entry->write ? ", writable" : "")
+);
+
+DECLARE_EVENT_CLASS(i915_gem_object,
+           TP_PROTO(struct drm_i915_gem_object *obj),
+           TP_ARGS(obj),
+
+           TP_STRUCT__entry(
+                            __field(struct drm_i915_gem_object *, obj)
+                            ),
+
+           TP_fast_assign(
+                          __entry->obj = obj;
+                          ),
+
+           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),
+           TP_ARGS(dev, size, align, mappable),
+
+           TP_STRUCT__entry(
+                            __field(u32, dev)
+                            __field(u32, size)
+                            __field(u32, align)
+                            __field(bool, mappable)
+                           ),
+
+           TP_fast_assign(
+                          __entry->dev = dev->primary->index;
+                          __entry->size = size;
+                          __entry->align = align;
+                          __entry->mappable = mappable;
+                         ),
+
+           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),
+           TP_ARGS(dev),
+
+           TP_STRUCT__entry(
+                            __field(u32, dev)
+                           ),
+
+           TP_fast_assign(
+                          __entry->dev = dev->primary->index;
+                         ),
+
+           TP_printk("dev=%d", __entry->dev)
+);
+
+TRACE_EVENT(i915_gem_ring_dispatch,
+           TP_PROTO(struct intel_ring_buffer *ring, u32 seqno, u32 flags),
+           TP_ARGS(ring, seqno, flags),
+
+           TP_STRUCT__entry(
+                            __field(u32, dev)
+                            __field(u32, ring)
+                            __field(u32, seqno)
+                            __field(u32, flags)
+                            ),
+
+           TP_fast_assign(
+                          __entry->dev = ring->dev->primary->index;
+                          __entry->ring = ring->id;
+                          __entry->seqno = seqno;
+                          __entry->flags = flags;
+                          i915_trace_irq_get(ring, seqno);
+                          ),
+
+           TP_printk("dev=%u, ring=%u, seqno=%u, flags=%x",
+                     __entry->dev, __entry->ring, __entry->seqno, __entry->flags)
+);
+
+TRACE_EVENT(i915_gem_ring_flush,
+           TP_PROTO(struct intel_ring_buffer *ring, u32 invalidate, u32 flush),
+           TP_ARGS(ring, invalidate, flush),
+
+           TP_STRUCT__entry(
+                            __field(u32, dev)
+                            __field(u32, ring)
+                            __field(u32, invalidate)
+                            __field(u32, flush)
+                            ),
+
+           TP_fast_assign(
+                          __entry->dev = ring->dev->primary->index;
+                          __entry->ring = ring->id;
+                          __entry->invalidate = invalidate;
+                          __entry->flush = 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),
+           TP_ARGS(ring, seqno),
+
+           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 = seqno;
+                          ),
+
+           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)
+);
+
+TRACE_EVENT(i915_gem_request_wait_begin,
+           TP_PROTO(struct intel_ring_buffer *ring, u32 seqno),
+           TP_ARGS(ring, seqno),
+
+           TP_STRUCT__entry(
+                            __field(u32, dev)
+                            __field(u32, ring)
+                            __field(u32, seqno)
+                            __field(bool, blocking)
+                            ),
+
+           /* NB: the blocking information is racy since mutex_is_locked
+            * doesn't check that the current thread holds the lock. The only
+            * other option would be to pass the boolean information of whether
+            * or not the class was blocking down through the stack which is
+            * less desirable.
+            */
+           TP_fast_assign(
+                          __entry->dev = ring->dev->primary->index;
+                          __entry->ring = ring->id;
+                          __entry->seqno = seqno;
+                          __entry->blocking = mutex_is_locked(&ring->dev->struct_mutex);
+                          ),
+
+           TP_printk("dev=%u, ring=%u, seqno=%u, blocking=%s",
+                     __entry->dev, __entry->ring, __entry->seqno,
+                     __entry->blocking ?  "yes (NB)" : "no")
+);
+
+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),
+           TP_ARGS(ring),
+
+           TP_STRUCT__entry(
+                            __field(u32, dev)
+                            __field(u32, ring)
+                            ),
+
+           TP_fast_assign(
+                          __entry->dev = ring->dev->primary->index;
+                          __entry->ring = ring->id;
+                          ),
+
+           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),
+
+           TP_ARGS(plane, obj),
+
+           TP_STRUCT__entry(
+                   __field(int, plane)
+                   __field(struct drm_i915_gem_object *, obj)
+                   ),
+
+           TP_fast_assign(
+                   __entry->plane = plane;
+                   __entry->obj = obj;
+                   ),
+
+           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),
+
+           TP_ARGS(plane, obj),
+
+           TP_STRUCT__entry(
+                   __field(int, plane)
+                   __field(struct drm_i915_gem_object *, obj)
+                   ),
+
+           TP_fast_assign(
+                   __entry->plane = plane;
+                   __entry->obj = obj;
+                   ),
+
+           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),
+
+       TP_ARGS(write, reg, val, len),
+
+       TP_STRUCT__entry(
+               __field(u64, val)
+               __field(u32, reg)
+               __field(u16, write)
+               __field(u16, len)
+               ),
+
+       TP_fast_assign(
+               __entry->val = (u64)val;
+               __entry->reg = reg;
+               __entry->write = write;
+               __entry->len = len;
+               ),
+
+       TP_printk("%s reg=0x%x, len=%d, val=(0x%x, 0x%x)",
+               __entry->write ? "write" : "read",
+               __entry->reg, __entry->len,
+               (u32)(__entry->val & 0xffffffff),
+               (u32)(__entry->val >> 32))
+);
+
+TRACE_EVENT(intel_gpu_freq_change,
+           TP_PROTO(u32 freq),
+           TP_ARGS(freq),
+
+           TP_STRUCT__entry(
+                            __field(u32, freq)
+                            ),
+
+           TP_fast_assign(
+                          __entry->freq = freq;
+                          ),
+
+           TP_printk("new_freq=%u", __entry->freq)
+);
+
+#endif /* _I915_TRACE_H_ */
+
+/* This part must be outside protection */
+#undef TRACE_INCLUDE_PATH
+#define TRACE_INCLUDE_PATH .
index 0571757..5701329 100644 (file)
@@ -1,4 +1,4 @@
-/*     $OpenBSD: intel_pm.c,v 1.32 2015/04/12 11:26:54 jsg Exp $       */
+/*     $OpenBSD: intel_pm.c,v 1.33 2015/04/18 11:41:29 jsg Exp $       */
 /*
  * Copyright © 2012 Intel Corporation
  *
@@ -2488,7 +2488,7 @@ void gen6_set_rps(struct drm_device *dev, u8 val)
 
        dev_priv->rps.cur_delay = val;
 
-//     trace_intel_gpu_freq_change(val * 50);
+       trace_intel_gpu_freq_change(val * 50);
 }
 
 static void gen6_disable_rps(struct drm_device *dev)
index 92e14c4..c49495c 100644 (file)
@@ -1,4 +1,4 @@
-/*     $OpenBSD: radeon_fence.c,v 1.6 2015/04/12 03:54:10 jsg Exp $    */
+/*     $OpenBSD: radeon_fence.c,v 1.7 2015/04/18 11:41:29 jsg Exp $    */
 /*
  * Copyright 2009 Jerome Glisse.
  * All Rights Reserved.
@@ -32,9 +32,7 @@
 #include <dev/pci/drm/drmP.h>
 #include "radeon_reg.h"
 #include "radeon.h"
-#ifdef notyet
 #include "radeon_trace.h"
-#endif
 
 #include <dev/pci/drm/refcount.h>
 
@@ -116,9 +114,7 @@ int radeon_fence_emit(struct radeon_device *rdev,
        (*fence)->seq = ++rdev->fence_drv[ring].sync_seq[ring];
        (*fence)->ring = ring;
        radeon_fence_ring_emit(rdev, ring, *fence);
-#ifdef notyet
        trace_radeon_fence_emit(rdev->ddev, (*fence)->seq);
-#endif
        return 0;
 }
 
@@ -303,9 +299,7 @@ static int radeon_fence_wait_seq(struct radeon_device *rdev, u64 target_seq,
                /* Save current last activity valuee, used to check for GPU lockups */
                last_activity = rdev->fence_drv[ring].last_activity;
 
-#ifdef notyet
                trace_radeon_fence_wait_begin(rdev->ddev, seq);
-#endif
                radeon_irq_kms_sw_irq_get(rdev, ring);
                r = timeout;
                while (r > 0) {
@@ -324,9 +318,7 @@ static int radeon_fence_wait_seq(struct radeon_device *rdev, u64 target_seq,
                if (unlikely(r < 0)) {
                        return r;
                }
-#ifdef notyet
                trace_radeon_fence_wait_end(rdev->ddev, seq);
-#endif
 
                if (unlikely(!signaled)) {
                        /* we were interrupted for some reason and fence
@@ -476,9 +468,7 @@ static int radeon_fence_wait_any_seq(struct radeon_device *rdev,
                        timeout = 1;
                }
 
-#ifdef notyet
                trace_radeon_fence_wait_begin(rdev->ddev, target_seq[ring]);
-#endif
                for (i = 0; i < RADEON_NUM_RINGS; ++i) {
                        if (target_seq[i]) {
                                radeon_irq_kms_sw_irq_get(rdev, i);
@@ -505,9 +495,7 @@ static int radeon_fence_wait_any_seq(struct radeon_device *rdev,
                if (unlikely(r < 0)) {
                        return r;
                }
-#ifdef notyet
                trace_radeon_fence_wait_end(rdev->ddev, target_seq[ring]);
-#endif
 
                if (unlikely(!signaled)) {
                        /* we were interrupted for some reason and fence
index 1836ecd..a6fa4f8 100644 (file)
@@ -1,4 +1,4 @@
-/*     $OpenBSD: radeon_object.c,v 1.9 2015/04/06 07:38:49 jsg Exp $   */
+/*     $OpenBSD: radeon_object.c,v 1.10 2015/04/18 11:41:29 jsg Exp $  */
 /*
  * Copyright 2009 Jerome Glisse.
  * All Rights Reserved.
@@ -33,9 +33,7 @@
 #include <dev/pci/drm/drmP.h>
 #include <dev/pci/drm/radeon_drm.h>
 #include "radeon.h"
-#ifdef notyet
 #include "radeon_trace.h"
-#endif
 
 
 int radeon_ttm_init(struct radeon_device *rdev);
@@ -160,9 +158,7 @@ int radeon_bo_create(struct radeon_device *rdev,
        }
        *bo_ptr = bo;
 
-#ifdef notyet
        trace_radeon_bo_create(bo);
-#endif
 
        return 0;
 }
index 036e41d..707e41c 100644 (file)
@@ -1,4 +1,4 @@
-/*     $OpenBSD: radeon_semaphore.c,v 1.2 2014/02/09 11:03:31 jsg Exp $        */
+/*     $OpenBSD: radeon_semaphore.c,v 1.3 2015/04/18 11:41:29 jsg Exp $        */
 /*
  * Copyright 2011 Christian König.
  * All Rights Reserved.
@@ -30,7 +30,7 @@
  */
 #include <dev/pci/drm/drmP.h>
 #include "radeon.h"
-
+#include "radeon_trace.h"
 
 int radeon_semaphore_create(struct radeon_device *rdev,
                            struct radeon_semaphore **semaphore)
@@ -57,6 +57,8 @@ int radeon_semaphore_create(struct radeon_device *rdev,
 void radeon_semaphore_emit_signal(struct radeon_device *rdev, int ring,
                                  struct radeon_semaphore *semaphore)
 {
+       trace_radeon_semaphore_signale(ring, semaphore);
+
        --semaphore->waiters;
        radeon_semaphore_ring_emit(rdev, ring, &rdev->ring[ring], semaphore, false);
 }
@@ -64,6 +66,8 @@ void radeon_semaphore_emit_signal(struct radeon_device *rdev, int ring,
 void radeon_semaphore_emit_wait(struct radeon_device *rdev, int ring,
                                struct radeon_semaphore *semaphore)
 {
+       trace_radeon_semaphore_wait(ring, semaphore);
+
        ++semaphore->waiters;
        radeon_semaphore_ring_emit(rdev, ring, &rdev->ring[ring], semaphore, true);
 }
index fd559fd..a0426d0 100644 (file)
@@ -1,4 +1,4 @@
-/*     $OpenBSD: radeon_trace.h,v 1.1 2013/08/12 04:11:53 jsg Exp $    */
+/*     $OpenBSD: radeon_trace.h,v 1.2 2015/04/18 11:41:29 jsg Exp $    */
 
 #if !defined(_RADEON_TRACE_H) || defined(TRACE_HEADER_MULTI_READ)
 #define _RADEON_TRACE_H_
@@ -72,9 +72,44 @@ DEFINE_EVENT(radeon_fence_request, radeon_fence_wait_end,
            TP_ARGS(dev, seqno)
 );
 
+DECLARE_EVENT_CLASS(radeon_semaphore_request,
+
+           TP_PROTO(int ring, struct radeon_semaphore *sem),
+
+           TP_ARGS(ring, sem),
+
+           TP_STRUCT__entry(
+                            __field(int, ring)
+                            __field(signed, waiters)
+                            __field(uint64_t, gpu_addr)
+                            ),
+
+           TP_fast_assign(
+                          __entry->ring = ring;
+                          __entry->waiters = sem->waiters;
+                          __entry->gpu_addr = sem->gpu_addr;
+                          ),
+
+           TP_printk("ring=%u, waiters=%d, addr=%010Lx", __entry->ring,
+                     __entry->waiters, __entry->gpu_addr)
+);
+
+DEFINE_EVENT(radeon_semaphore_request, radeon_semaphore_signale,
+
+           TP_PROTO(int ring, struct radeon_semaphore *sem),
+
+           TP_ARGS(ring, sem)
+);
+
+DEFINE_EVENT(radeon_semaphore_request, radeon_semaphore_wait,
+
+           TP_PROTO(int ring, struct radeon_semaphore *sem),
+
+           TP_ARGS(ring, sem)
+);
+
 #endif
 
 /* This part must be outside protection */
 #undef TRACE_INCLUDE_PATH
 #define TRACE_INCLUDE_PATH .
-#include <trace/define_trace.h>