drm/i915/ddi: Remove ->mode_set callback

[linux-2.6-block.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 23c26f1f8b372e960f9f3dd5901a818a6a314374..b29d7b1828f1dc56d7fcfb681f4dfcfb443911e2 100644 (file)
--- 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,