drm/i915: Reduce the pointer dance of i915_is_ggtt()

[deliverable/linux.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 52b2d409945d27c81b148fda8c8a5b350a59fb0d..fa09e558113761cac4fafd75e53c5a509bf342a5 100644 (file)
--- a/drivers/gpu/drm/i915/i915_trace.h
+++ b/drivers/gpu/drm/i915/i915_trace.h
@@ -175,35 +175,24 @@ TRACE_EVENT(i915_vma_unbind,
                      __entry->obj, __entry->offset, __entry->size, __entry->vm)
 );
 
-#define VM_TO_TRACE_NAME(vm) \
-       (i915_is_ggtt(vm) ? "G" : \
-                     "P")
-
-DECLARE_EVENT_CLASS(i915_va,
-       TP_PROTO(struct i915_address_space *vm, u64 start, u64 length, const char *name),
-       TP_ARGS(vm, start, length, name),
+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)
-               __string(name, name)
        ),
 
        TP_fast_assign(
-               __entry->vm = vm;
-               __entry->start = start;
-               __entry->end = start + length - 1;
-               __assign_str(name, name);
+               __entry->vm = vma->vm;
+               __entry->start = vma->node.start;
+               __entry->end = vma->node.start + vma->node.size - 1;
        ),
 
-       TP_printk("vm=%p (%s), 0x%llx-0x%llx",
-                 __entry->vm, __get_str(name),  __entry->start, __entry->end)
-);
-
-DEFINE_EVENT(i915_va, i915_va_alloc,
-            TP_PROTO(struct i915_address_space *vm, u64 start, u64 length, const char *name),
-            TP_ARGS(vm, start, length, name)
+       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,