drm/i915: Add VLV/CHV watermark/FIFO programming tracepoints

Add tracepoints for observing the WM/FIFO programming on VLV/CHV. When
compared with the plane and pipe update tracepoints this can be used
to verify that everything is performed in the right sequence.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20170302171508.1666-17-ville.syrjala@linux.intel.com

diff --git a/drivers/gpu/drm/i915/i915_trace.h b/drivers/gpu/drm/i915/i915_trace.h
index 6cb03bd40aefc541454bd9938263f3ff9d73e138..ca81987853114599834efdc9b86593943cd589f0 100644 (file)
--- a/drivers/gpu/drm/i915/i915_trace.h
+++ b/drivers/gpu/drm/i915/i915_trace.h
@@ -14,6 +14,77 @@
 #define TRACE_SYSTEM i915
 #define TRACE_INCLUDE_FILE i915_trace
 
+/* watermark/fifo updates */
+
+TRACE_EVENT(vlv_wm,
+           TP_PROTO(struct intel_crtc *crtc, const struct vlv_wm_values *wm),
+           TP_ARGS(crtc, wm),
+
+           TP_STRUCT__entry(
+                            __field(enum pipe, pipe)
+                            __field(u32, frame)
+                            __field(u32, scanline)
+                            __field(u32, level)
+                            __field(u32, cxsr)
+                            __field(u32, primary)
+                            __field(u32, sprite0)
+                            __field(u32, sprite1)
+                            __field(u32, cursor)
+                            __field(u32, sr_plane)
+                            __field(u32, sr_cursor)
+                            ),
+
+           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->level = wm->level;
+                          __entry->cxsr = wm->cxsr;
+                          __entry->primary = wm->pipe[crtc->pipe].plane[PLANE_PRIMARY];
+                          __entry->sprite0 = wm->pipe[crtc->pipe].plane[PLANE_SPRITE0];
+                          __entry->sprite1 = wm->pipe[crtc->pipe].plane[PLANE_SPRITE1];
+                          __entry->cursor = wm->pipe[crtc->pipe].plane[PLANE_CURSOR];
+                          __entry->sr_plane = wm->sr.plane;
+                          __entry->sr_cursor = wm->sr.cursor;
+                          ),
+
+           TP_printk("pipe %c, frame=%u, scanline=%u, level=%d, cxsr=%d, wm %d/%d/%d/%d, sr %d/%d",
+                     pipe_name(__entry->pipe), __entry->frame,
+                     __entry->scanline, __entry->level, __entry->cxsr,
+                     __entry->primary, __entry->sprite0, __entry->sprite1, __entry->cursor,
+                     __entry->sr_plane, __entry->sr_cursor)
+);
+
+TRACE_EVENT(vlv_fifo_size,
+           TP_PROTO(struct intel_crtc *crtc, u32 sprite0_start, u32 sprite1_start, u32 fifo_size),
+           TP_ARGS(crtc, sprite0_start, sprite1_start, fifo_size),
+
+           TP_STRUCT__entry(
+                            __field(enum pipe, pipe)
+                            __field(u32, frame)
+                            __field(u32, scanline)
+                            __field(u32, sprite0_start)
+                            __field(u32, sprite1_start)
+                            __field(u32, fifo_size)
+                            ),
+
+           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->sprite0_start = sprite0_start;
+                          __entry->sprite1_start = sprite1_start;
+                          __entry->fifo_size = fifo_size;
+                          ),
+
+           TP_printk("pipe %c, frame=%u, scanline=%u, %d/%d/%d",
+                     pipe_name(__entry->pipe), __entry->frame,
+                     __entry->scanline, __entry->sprite0_start,
+                     __entry->sprite1_start, __entry->fifo_size)
+);
+
 /* plane updates */
 
 TRACE_EVENT(intel_update_plane,

diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
index 9e4c7a0b0407993683ee3d2f4095f016f89f7587..dc85501cfff3ff5a59aa53f7432ea3aa7b3d95bd 100644 (file)
--- a/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm/i915/intel_pm.c
@@ -888,6 +888,8 @@ static void vlv_write_wm_values(struct drm_i915_private *dev_priv,
        enum pipe pipe;
 
        for_each_pipe(dev_priv, pipe) {
+               trace_vlv_wm(intel_get_crtc_for_pipe(dev_priv, pipe), wm);
+
                I915_WRITE(VLV_DDL(pipe),
                           (wm->ddl[pipe].plane[PLANE_CURSOR] << DDL_CURSOR_SHIFT) |
                           (wm->ddl[pipe].plane[PLANE_SPRITE1] << DDL_SPRITE_SHIFT(1)) |
@@ -1352,6 +1354,8 @@ static void vlv_atomic_update_fifo(struct intel_atomic_state *state,
        WARN_ON(fifo_state->plane[PLANE_CURSOR] != 63);
        WARN_ON(fifo_size != 511);
 
+       trace_vlv_fifo_size(crtc, sprite0_start, sprite1_start, fifo_size);
+
        spin_lock(&dev_priv->wm.dsparb_lock);
 
        switch (crtc->pipe) {