drm/i915: Remove defunct GTT tracepoints

The tracepoints are now entirely synonymous with binding and unbinding the
VMA (and the tracepoints there).

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Matthew Auld <matthew.auld@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20170215084357.19977-18-chris@chris-wilson.co.uk

diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c
index 9db033c..0748c44 100644 (file)
--- a/drivers/gpu/drm/i915/i915_gem_gtt.c
+++ b/drivers/gpu/drm/i915/i915_gem_gtt.c
@@ -193,7 +193,6 @@ static int ppgtt_bind_vma(struct i915_vma *vma,
        u32 pte_flags;
        int ret;
 
-       trace_i915_va_alloc(vma);
        ret = vma->vm->allocate_va_range(vma->vm, vma->node.start, vma->size);
        if (ret)
                return ret;
@@ -1321,9 +1320,6 @@ static int gen8_ppgtt_init(struct i915_hw_ppgtt *ppgtt)
 
                ppgtt->base.total = 1ULL << 32;
                ppgtt->switch_mm = gen8_legacy_mm_switch;
-               trace_i915_page_directory_pointer_entry_alloc(&ppgtt->base,
-                                                             0, 0,
-                                                             GEN8_PML4E_SHIFT);
 
                if (intel_vgpu_active(dev_priv)) {
                        ret = gen8_preallocate_top_level_pdp(ppgtt);

diff --git a/drivers/gpu/drm/i915/i915_trace.h b/drivers/gpu/drm/i915/i915_trace.h
index de31c49..7a547cd 100644 (file)
--- a/drivers/gpu/drm/i915/i915_trace.h
+++ b/drivers/gpu/drm/i915/i915_trace.h
@@ -175,103 +175,6 @@ TRACE_EVENT(i915_vma_unbind,
                      __entry->obj, __entry->offset, __entry->size, __entry->vm)
 );
 
-TRACE_EVENT(i915_va_alloc,
-       TP_PROTO(struct i915_vma *vma),
-       TP_ARGS(vma),
-
-       TP_STRUCT__entry(
-               __field(struct i915_address_space *, vm)
-               __field(u64, start)
-               __field(u64, end)
-       ),
-
-       TP_fast_assign(
-               __entry->vm = vma->vm;
-               __entry->start = vma->node.start;
-               __entry->end = vma->node.start + vma->node.size - 1;
-       ),
-
-       TP_printk("vm=%p (%c), 0x%llx-0x%llx",
-                 __entry->vm, i915_is_ggtt(__entry->vm) ? 'G' : 'P',  __entry->start, __entry->end)
-);
-
-DECLARE_EVENT_CLASS(i915_px_entry,
-       TP_PROTO(struct i915_address_space *vm, u32 px, u64 start, u64 px_shift),
-       TP_ARGS(vm, px, start, px_shift),
-
-       TP_STRUCT__entry(
-               __field(struct i915_address_space *, vm)
-               __field(u32, px)
-               __field(u64, start)
-               __field(u64, end)
-       ),
-
-       TP_fast_assign(
-               __entry->vm = vm;
-               __entry->px = px;
-               __entry->start = start;
-               __entry->end = ((start + (1ULL << px_shift)) & ~((1ULL << px_shift)-1)) - 1;
-       ),
-
-       TP_printk("vm=%p, pde=%d (0x%llx-0x%llx)",
-                 __entry->vm, __entry->px, __entry->start, __entry->end)
-);
-
-DEFINE_EVENT(i915_px_entry, i915_page_table_entry_alloc,
-            TP_PROTO(struct i915_address_space *vm, u32 pde, u64 start, u64 pde_shift),
-            TP_ARGS(vm, pde, start, pde_shift)
-);
-
-DEFINE_EVENT_PRINT(i915_px_entry, i915_page_directory_entry_alloc,
-                  TP_PROTO(struct i915_address_space *vm, u32 pdpe, u64 start, u64 pdpe_shift),
-                  TP_ARGS(vm, pdpe, start, pdpe_shift),
-
-                  TP_printk("vm=%p, pdpe=%d (0x%llx-0x%llx)",
-                            __entry->vm, __entry->px, __entry->start, __entry->end)
-);
-
-DEFINE_EVENT_PRINT(i915_px_entry, i915_page_directory_pointer_entry_alloc,
-                  TP_PROTO(struct i915_address_space *vm, u32 pml4e, u64 start, u64 pml4e_shift),
-                  TP_ARGS(vm, pml4e, start, pml4e_shift),
-
-                  TP_printk("vm=%p, pml4e=%d (0x%llx-0x%llx)",
-                            __entry->vm, __entry->px, __entry->start, __entry->end)
-);
-
-/* Avoid extra math because we only support two sizes. The format is defined by
- * bitmap_scnprintf. Each 32 bits is 8 HEX digits followed by comma */
-#define TRACE_PT_SIZE(bits) \
-       ((((bits) == 1024) ? 288 : 144) + 1)
-
-DECLARE_EVENT_CLASS(i915_page_table_entry_update,
-       TP_PROTO(struct i915_address_space *vm, u32 pde,
-                struct i915_page_table *pt, u32 first, u32 count),
-       TP_ARGS(vm, pde, pt, first, count),
-
-       TP_STRUCT__entry(
-               __field(struct i915_address_space *, vm)
-               __field(u32, pde)
-               __field(u32, first)
-               __field(u32, last)
-       ),
-
-       TP_fast_assign(
-               __entry->vm = vm;
-               __entry->pde = pde;
-               __entry->first = first;
-               __entry->last = first + count - 1;
-       ),
-
-       TP_printk("vm=%p, pde=%d, updating %u:%u",
-                 __entry->vm, __entry->pde, __entry->last, __entry->first)
-);
-
-DEFINE_EVENT(i915_page_table_entry_update, i915_page_table_entry_map,
-       TP_PROTO(struct i915_address_space *vm, u32 pde,
-                struct i915_page_table *pt, u32 first, u32 count),
-       TP_ARGS(vm, pde, pt, first, count)
-);
-
 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),