Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e93329a5 authored by Ville Syrjälä's avatar Ville Syrjälä
Browse files

drm/i915: Add g4x watermark tracepoint 



Add a tracepoint for watermark programming on g4x, similar to what we
have on vlv/chv. Should help in debugging watermark programming sequence
issues.

Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20170421181432.15216-15-ville.syrjala@linux.intel.com


Reviewed-by: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
parent 79d94306

drivers/gpu/drm/i915/i915_trace.h

+49 −0
Original line number Diff line number Diff line
@@ -89,6 +89,55 @@ TRACE_EVENT(intel_memory_cxsr, 
		      __entry->frame[PIPE_C], __entry->scanline[PIPE_C])

);



TRACE_EVENT(g4x_wm,

	    TP_PROTO(struct intel_crtc *crtc, const struct g4x_wm_values *wm),

	    TP_ARGS(crtc, wm),



	    TP_STRUCT__entry(

			     __field(enum pipe, pipe)

			     __field(u32, frame)

			     __field(u32, scanline)

			     __field(u16, primary)

			     __field(u16, sprite)

			     __field(u16, cursor)

			     __field(u16, sr_plane)

			     __field(u16, sr_cursor)

			     __field(u16, sr_fbc)

			     __field(u16, hpll_plane)

			     __field(u16, hpll_cursor)

			     __field(u16, hpll_fbc)

			     __field(bool, cxsr)

			     __field(bool, hpll)

			     __field(bool, fbc)

			     ),



	    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->primary = wm->pipe[crtc->pipe].plane[PLANE_PRIMARY];

			   __entry->sprite = wm->pipe[crtc->pipe].plane[PLANE_SPRITE0];

			   __entry->cursor = wm->pipe[crtc->pipe].plane[PLANE_CURSOR];

			   __entry->sr_plane = wm->sr.plane;

			   __entry->sr_cursor = wm->sr.cursor;

			   __entry->sr_fbc = wm->sr.fbc;

			   __entry->hpll_plane = wm->hpll.plane;

			   __entry->hpll_cursor = wm->hpll.cursor;

			   __entry->hpll_fbc = wm->hpll.fbc;

			   __entry->cxsr = wm->cxsr;

			   __entry->hpll = wm->hpll_en;

			   __entry->fbc = wm->fbc_en;

			   ),



	    TP_printk("pipe %c, frame=%u, scanline=%u, wm %d/%d/%d, sr %s/%d/%d/%d, hpll %s/%d/%d/%d, fbc %s",

		      pipe_name(__entry->pipe), __entry->frame, __entry->scanline,

		      __entry->primary, __entry->sprite, __entry->cursor,

		      yesno(__entry->cxsr), __entry->sr_plane, __entry->sr_cursor, __entry->sr_fbc,

		      yesno(__entry->hpll), __entry->hpll_plane, __entry->hpll_cursor, __entry->hpll_fbc,

		      yesno(__entry->fbc))

);



TRACE_EVENT(vlv_wm,

	    TP_PROTO(struct intel_crtc *crtc, const struct vlv_wm_values *wm),

	    TP_ARGS(crtc, wm),

drivers/gpu/drm/i915/intel_pm.c

+5 −0
Original line number Diff line number Diff line
@@ -913,6 +913,11 @@ static int g4x_tlb_miss_wa(int fifo_size, int width, int cpp) 
static void g4x_write_wm_values(struct drm_i915_private *dev_priv,

				const struct g4x_wm_values *wm)

{

	enum pipe pipe;



	for_each_pipe(dev_priv, pipe)

		trace_g4x_wm(intel_get_crtc_for_pipe(dev_priv, pipe), wm);



	I915_WRITE(DSPFW1,

		   FW_WM(wm->sr.plane, SR) |

		   FW_WM(wm->pipe[PIPE_B].plane[PLANE_CURSOR], CURSORB) |