Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/external/bsd/drm2/dist/drm/i915 I thought I removed this...



details:   https://anonhg.NetBSD.org/src/rev/1f1d3589184e
branches:  trunk
changeset: 330645:1f1d3589184e
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Wed Jul 16 21:11:47 2014 +0000

description:
I thought I removed this troublemaker already.

diffstat:

 sys/external/bsd/drm2/dist/drm/i915/i915_trace.h |  520 -----------------------
 1 files changed, 0 insertions(+), 520 deletions(-)

diffs (truncated from 524 to 300 lines):

diff -r 7cbbe2c273c5 -r 1f1d3589184e sys/external/bsd/drm2/dist/drm/i915/i915_trace.h
--- a/sys/external/bsd/drm2/dist/drm/i915/i915_trace.h  Wed Jul 16 20:59:57 2014 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,520 +0,0 @@
-#if !defined(_I915_TRACE_H_) || defined(TRACE_HEADER_MULTI_READ)
-#define _I915_TRACE_H_
-
-#include <linux/stringify.h>
-#include <linux/types.h>
-#include <linux/tracepoint.h>
-
-#include <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_vma_bind,
-           TP_PROTO(struct i915_vma *vma, unsigned flags),
-           TP_ARGS(vma, flags),
-
-           TP_STRUCT__entry(
-                            __field(struct drm_i915_gem_object *, obj)
-                            __field(struct i915_address_space *, vm)
-                            __field(u32, offset)
-                            __field(u32, size)
-                            __field(unsigned, flags)
-                            ),
-
-           TP_fast_assign(
-                          __entry->obj = vma->obj;
-                          __entry->vm = vma->vm;
-                          __entry->offset = vma->node.start;
-                          __entry->size = vma->node.size;
-                          __entry->flags = flags;
-                          ),
-
-           TP_printk("obj=%p, offset=%08x size=%x%s vm=%p",
-                     __entry->obj, __entry->offset, __entry->size,
-                     __entry->flags & PIN_MAPPABLE ? ", mappable" : "",
-                     __entry->vm)
-);
-
-TRACE_EVENT(i915_vma_unbind,
-           TP_PROTO(struct i915_vma *vma),
-           TP_ARGS(vma),
-
-           TP_STRUCT__entry(
-                            __field(struct drm_i915_gem_object *, obj)
-                            __field(struct i915_address_space *, vm)
-                            __field(u32, offset)
-                            __field(u32, size)
-                            ),
-
-           TP_fast_assign(
-                          __entry->obj = vma->obj;
-                          __entry->vm = vma->vm;
-                          __entry->offset = vma->node.start;
-                          __entry->size = vma->node.size;
-                          ),
-
-           TP_printk("obj=%p, offset=%08x size=%x vm=%p",
-                     __entry->obj, __entry->offset, __entry->size, __entry->vm)
-);
-
-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, unsigned flags),
-           TP_ARGS(dev, size, align, flags),
-
-           TP_STRUCT__entry(
-                            __field(u32, dev)
-                            __field(u32, size)
-                            __field(u32, align)
-                            __field(unsigned, flags)
-                           ),
-
-           TP_fast_assign(
-                          __entry->dev = dev->primary->index;
-                          __entry->size = size;
-                          __entry->align = align;
-                          __entry->flags = flags;
-                         ),
-
-           TP_printk("dev=%d, size=%d, align=%d %s",
-                     __entry->dev, __entry->size, __entry->align,
-                     __entry->flags & PIN_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_evict_vm,
-           TP_PROTO(struct i915_address_space *vm),
-           TP_ARGS(vm),
-
-           TP_STRUCT__entry(
-                            __field(u32, dev)
-                            __field(struct i915_address_space *, vm)
-                           ),
-
-           TP_fast_assign(
-                          __entry->dev = vm->dev->primary->index;
-                          __entry->vm = vm;
-                         ),
-
-           TP_printk("dev=%d, vm=%p", __entry->dev, __entry->vm)
-);
-
-TRACE_EVENT(i915_gem_ring_sync_to,
-           TP_PROTO(struct intel_ring_buffer *from,
-                    struct intel_ring_buffer *to,
-                    u32 seqno),
-           TP_ARGS(from, to, seqno),
-
-           TP_STRUCT__entry(
-                            __field(u32, dev)
-                            __field(u32, sync_from)
-                            __field(u32, sync_to)
-                            __field(u32, seqno)
-                            ),
-
-           TP_fast_assign(
-                          __entry->dev = from->dev->primary->index;
-                          __entry->sync_from = from->id;
-                          __entry->sync_to = to->id;
-                          __entry->seqno = seqno;
-                          ),
-
-           TP_printk("dev=%u, sync-from=%u, sync-to=%u, seqno=%u",
-                     __entry->dev,
-                     __entry->sync_from, __entry->sync_to,
-                     __entry->seqno)
-);
-
-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);
-                          ),



Home | Main Index | Thread Index | Old Index