1 files changed, 88 insertions, 13 deletions

diff --git a/drivers/gpu/drm/i915/i915_trace.h b/drivers/gpu/drm/i915/i915_trace.h
index 23c26f1f8b37..f5aa0067755a 100644
--- a/drivers/gpu/drm/i915/i915_trace.h
+++ b/drivers/gpu/drm/i915/i915_trace.h
@@ -7,6 +7,7 @@
 
 #include <drm/drmP.h>
 #include "i915_drv.h"
+#include "intel_drv.h"
 #include "intel_ringbuffer.h"
 
 #undef TRACE_SYSTEM
@@ -14,6 +15,80 @@
 #define TRACE_SYSTEM_STRING __stringify(TRACE_SYSTEM)
 #define TRACE_INCLUDE_FILE i915_trace
 
+/* pipe updates */
+
+TRACE_EVENT(i915_pipe_update_start,
+            TP_PROTO(struct intel_crtc *crtc, u32 min, u32 max),
+            TP_ARGS(crtc, min, max),
+
+            TP_STRUCT__entry(
+                             __field(enum pipe, pipe)
+                             __field(u32, frame)
+                             __field(u32, scanline)
+                             __field(u32, min)
+                             __field(u32, max)
+                             ),
+
+            TP_fast_assign(
+                           __entry->pipe = crtc->pipe;
+                           __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;
+                           ),
+
+            TP_printk("pipe %c, frame=%u, scanline=%u, min=%u, max=%u",
+                      pipe_name(__entry->pipe), __entry->frame,
+                       __entry->scanline, __entry->min, __entry->max)
+);
+
+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_STRUCT__entry(
+                             __field(enum pipe, pipe)
+                             __field(u32, frame)
+                             __field(u32, scanline)
+                             __field(u32, min)
+                             __field(u32, max)
+                             ),
+
+            TP_fast_assign(
+                           __entry->pipe = crtc->pipe;
+                           __entry->frame = frame;
+                           __entry->scanline = intel_get_crtc_scanline(crtc);
+                           __entry->min = min;
+                           __entry->max = max;
+                           ),
+
+            TP_printk("pipe %c, frame=%u, scanline=%u, min=%u, max=%u",
+                      pipe_name(__entry->pipe), __entry->frame,
+                       __entry->scanline, __entry->min, __entry->max)
+);
+
+TRACE_EVENT(i915_pipe_update_end,
+            TP_PROTO(struct intel_crtc *crtc, u32 frame),
+            TP_ARGS(crtc, frame),
+
+            TP_STRUCT__entry(
+                             __field(enum pipe, pipe)
+                             __field(u32, frame)
+                             __field(u32, scanline)
+                             ),
+
+            TP_fast_assign(
+                           __entry->pipe = crtc->pipe;
+                           __entry->frame = frame;
+                           __entry->scanline = intel_get_crtc_scanline(crtc);
+                           ),
+
+            TP_printk("pipe %c, frame=%u, scanline=%u",
+                      pipe_name(__entry->pipe), __entry->frame,
+                      __entry->scanline)
+);
+
 /* object tracking */
 
 TRACE_EVENT(i915_gem_object_create,
@@ -251,8 +326,8 @@ TRACE_EVENT(i915_gem_evict_vm,
 );
 
 TRACE_EVENT(i915_gem_ring_sync_to,
-            TP_PROTO(struct intel_ring_buffer *from,
-                     struct intel_ring_buffer *to,
+            TP_PROTO(struct intel_engine_cs *from,
+                     struct intel_engine_cs *to,
                      u32 seqno),
             TP_ARGS(from, to, seqno),
 
@@ -277,7 +352,7 @@ TRACE_EVENT(i915_gem_ring_sync_to,
 );
 
 TRACE_EVENT(i915_gem_ring_dispatch,
-            TP_PROTO(struct intel_ring_buffer *ring, u32 seqno, u32 flags),
+            TP_PROTO(struct intel_engine_cs *ring, u32 seqno, u32 flags),
             TP_ARGS(ring, seqno, flags),
 
             TP_STRUCT__entry(
@@ -300,7 +375,7 @@ TRACE_EVENT(i915_gem_ring_dispatch,
 );
 
 TRACE_EVENT(i915_gem_ring_flush,
-            TP_PROTO(struct intel_ring_buffer *ring, u32 invalidate, u32 flush),
+            TP_PROTO(struct intel_engine_cs *ring, u32 invalidate, u32 flush),
             TP_ARGS(ring, invalidate, flush),
 
             TP_STRUCT__entry(
@@ -323,7 +398,7 @@ TRACE_EVENT(i915_gem_ring_flush,
 );
 
 DECLARE_EVENT_CLASS(i915_gem_request,
-            TP_PROTO(struct intel_ring_buffer *ring, u32 seqno),
+            TP_PROTO(struct intel_engine_cs *ring, u32 seqno),
             TP_ARGS(ring, seqno),
 
             TP_STRUCT__entry(
@@ -343,12 +418,12 @@ DECLARE_EVENT_CLASS(i915_gem_request,
 );
 
 DEFINE_EVENT(i915_gem_request, i915_gem_request_add,
-            TP_PROTO(struct intel_ring_buffer *ring, u32 seqno),
+            TP_PROTO(struct intel_engine_cs *ring, u32 seqno),
             TP_ARGS(ring, seqno)
 );
 
 TRACE_EVENT(i915_gem_request_complete,
-            TP_PROTO(struct intel_ring_buffer *ring),
+            TP_PROTO(struct intel_engine_cs *ring),
             TP_ARGS(ring),
 
             TP_STRUCT__entry(
@@ -368,12 +443,12 @@ TRACE_EVENT(i915_gem_request_complete,
 );
 
 DEFINE_EVENT(i915_gem_request, i915_gem_request_retire,
-            TP_PROTO(struct intel_ring_buffer *ring, u32 seqno),
+            TP_PROTO(struct intel_engine_cs *ring, u32 seqno),
             TP_ARGS(ring, seqno)
 );
 
 TRACE_EVENT(i915_gem_request_wait_begin,
-            TP_PROTO(struct intel_ring_buffer *ring, u32 seqno),
+            TP_PROTO(struct intel_engine_cs *ring, u32 seqno),
             TP_ARGS(ring, seqno),
 
             TP_STRUCT__entry(
@@ -402,12 +477,12 @@ TRACE_EVENT(i915_gem_request_wait_begin,
 );
 
 DEFINE_EVENT(i915_gem_request, i915_gem_request_wait_end,
-            TP_PROTO(struct intel_ring_buffer *ring, u32 seqno),
+            TP_PROTO(struct intel_engine_cs *ring, u32 seqno),
             TP_ARGS(ring, seqno)
 );
 
 DECLARE_EVENT_CLASS(i915_ring,
-            TP_PROTO(struct intel_ring_buffer *ring),
+            TP_PROTO(struct intel_engine_cs *ring),
             TP_ARGS(ring),
 
             TP_STRUCT__entry(
@@ -424,12 +499,12 @@ DECLARE_EVENT_CLASS(i915_ring,
 );
 
 DEFINE_EVENT(i915_ring, i915_ring_wait_begin,
-            TP_PROTO(struct intel_ring_buffer *ring),
+            TP_PROTO(struct intel_engine_cs *ring),
             TP_ARGS(ring)
 );
 
 DEFINE_EVENT(i915_ring, i915_ring_wait_end,
-            TP_PROTO(struct intel_ring_buffer *ring),
+            TP_PROTO(struct intel_engine_cs *ring),
             TP_ARGS(ring)
 );