]> git.baikalelectronics.ru Git - kernel.git/commit
drm/i915: Fix various tracepoints for gen2
authorVille Syrjälä <ville.syrjala@linux.intel.com>
Wed, 19 Jun 2019 17:08:39 +0000 (20:08 +0300)
committerVille Syrjälä <ville.syrjala@linux.intel.com>
Wed, 26 Jun 2019 16:23:28 +0000 (19:23 +0300)
commit58066dd339f32a72c6921bcaeff9b9758c526e07
treea60ea197fbdf7291e0d82481951956febc8179ba
parent0c1331fcd63e5e69e7ded9c107f87ed77276b7f1
drm/i915: Fix various tracepoints for gen2

Gen2 doesn't have a frame counter and apparently we no longer provide
a fake .get_vblank_counter() hook for it. That means all tracepoints
calling that hook will oops. Update the tracepoints to use
intel_crtc_get_vblank_counter() which will gracefully fall back to
using the software counter. This is actually a better approach since
we now get (hopefully accurate) frame numbers in the traces.

This also gets rid of the raw driver->get_vblank_counter() calls, which
we need to do in order to switch to the per-crtc vblank vfuncs.

v2: Deal with new tracepoints
v3: Use a distinct variable name for the internal crtc iterator (Chris)

Cc: Shawn Guo <shawn.guo@linaro.org>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Fixes: 5b33bc2aaea3 ("drm: remove drm_vblank_no_hw_counter assignment from driver code")
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20190619170842.20579-2-ville.syrjala@linux.intel.com
drivers/gpu/drm/i915/display/intel_display.c
drivers/gpu/drm/i915/i915_trace.h