1 files changed, 57 insertions, 21 deletions

diff --git a/drivers/gpu/drm/i915/i915_trace.h b/drivers/gpu/drm/i915/i915_trace.h
index 2f34c47bd4bf..04fe8491c8b6 100644
--- a/drivers/gpu/drm/i915/i915_trace.h
+++ b/drivers/gpu/drm/i915/i915_trace.h
@@ -17,8 +17,8 @@
 /* pipe updates */
 
 TRACE_EVENT(i915_pipe_update_start,
-            TP_PROTO(struct intel_crtc *crtc, u32 min, u32 max),
-            TP_ARGS(crtc, min, max),
+            TP_PROTO(struct intel_crtc *crtc),
+            TP_ARGS(crtc),
 
             TP_STRUCT__entry(
                              __field(enum pipe, pipe)
@@ -33,8 +33,8 @@ TRACE_EVENT(i915_pipe_update_start,
                            __entry->frame = crtc->base.dev->driver->get_vblank_counter(crtc->base.dev,
                                                                                        crtc->pipe);
                            __entry->scanline = intel_get_crtc_scanline(crtc);
-                           __entry->min = min;
-                           __entry->max = max;
+                           __entry->min = crtc->debug.min_vbl;
+                           __entry->max = crtc->debug.max_vbl;
                            ),
 
             TP_printk("pipe %c, frame=%u, scanline=%u, min=%u, max=%u",
@@ -43,8 +43,8 @@ TRACE_EVENT(i915_pipe_update_start,
 );
 
 TRACE_EVENT(i915_pipe_update_vblank_evaded,
-            TP_PROTO(struct intel_crtc *crtc, u32 min, u32 max, u32 frame),
-            TP_ARGS(crtc, min, max, frame),
+            TP_PROTO(struct intel_crtc *crtc),
+            TP_ARGS(crtc),
 
             TP_STRUCT__entry(
                              __field(enum pipe, pipe)
@@ -56,10 +56,10 @@ TRACE_EVENT(i915_pipe_update_vblank_evaded,
 
             TP_fast_assign(
                            __entry->pipe = crtc->pipe;
-                           __entry->frame = frame;
-                           __entry->scanline = intel_get_crtc_scanline(crtc);
-                           __entry->min = min;
-                           __entry->max = max;
+                           __entry->frame = crtc->debug.start_vbl_count;
+                           __entry->scanline = crtc->debug.scanline_start;
+                           __entry->min = crtc->debug.min_vbl;
+                           __entry->max = crtc->debug.max_vbl;
                            ),
 
             TP_printk("pipe %c, frame=%u, scanline=%u, min=%u, max=%u",
@@ -68,8 +68,8 @@ TRACE_EVENT(i915_pipe_update_vblank_evaded,
 );
 
 TRACE_EVENT(i915_pipe_update_end,
-            TP_PROTO(struct intel_crtc *crtc, u32 frame),
-            TP_ARGS(crtc, frame),
+            TP_PROTO(struct intel_crtc *crtc, u32 frame, int scanline_end),
+            TP_ARGS(crtc, frame, scanline_end),
 
             TP_STRUCT__entry(
                              __field(enum pipe, pipe)
@@ -80,7 +80,7 @@ TRACE_EVENT(i915_pipe_update_end,
             TP_fast_assign(
                            __entry->pipe = crtc->pipe;
                            __entry->frame = frame;
-                           __entry->scanline = intel_get_crtc_scanline(crtc);
+                           __entry->scanline = scanline_end;
                            ),
 
             TP_printk("pipe %c, frame=%u, scanline=%u",
@@ -107,6 +107,26 @@ TRACE_EVENT(i915_gem_object_create,
             TP_printk("obj=%p, size=%u", __entry->obj, __entry->size)
 );
 
+TRACE_EVENT(i915_gem_shrink,
+            TP_PROTO(struct drm_i915_private *i915, unsigned long target, unsigned flags),
+            TP_ARGS(i915, target, flags),
+
+            TP_STRUCT__entry(
+                             __field(int, dev)
+                             __field(unsigned long, target)
+                             __field(unsigned, flags)
+                             ),
+
+            TP_fast_assign(
+                           __entry->dev = i915->dev->primary->index;
+                           __entry->target = target;
+                           __entry->flags = flags;
+                           ),
+
+            TP_printk("dev=%d, target=%lu, flags=%x",
+                      __entry->dev, __entry->target, __entry->flags)
+);
+
 TRACE_EVENT(i915_vma_bind,
             TP_PROTO(struct i915_vma *vma, unsigned flags),
             TP_ARGS(vma, flags),
@@ -186,33 +206,49 @@ DEFINE_EVENT(i915_va, i915_va_alloc,
              TP_ARGS(vm, start, length, name)
 );
 
-DECLARE_EVENT_CLASS(i915_page_table_entry,
-        TP_PROTO(struct i915_address_space *vm, u32 pde, u64 start, u64 pde_shift),
-        TP_ARGS(vm, pde, start, pde_shift),
+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, pde)
+                __field(u32, px)
                 __field(u64, start)
                 __field(u64, end)
         ),
 
         TP_fast_assign(
                 __entry->vm = vm;
-                __entry->pde = pde;
+                __entry->px = px;
                 __entry->start = start;
-                __entry->end = ((start + (1ULL << pde_shift)) & ~((1ULL << pde_shift)-1)) - 1;
+                __entry->end = ((start + (1ULL << px_shift)) & ~((1ULL << px_shift)-1)) - 1;
         ),
 
         TP_printk("vm=%p, pde=%d (0x%llx-0x%llx)",
-                  __entry->vm, __entry->pde, __entry->start, __entry->end)
+                  __entry->vm, __entry->px, __entry->start, __entry->end)
 );
 
-DEFINE_EVENT(i915_page_table_entry, i915_page_table_entry_alloc,
+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) \