Commit 246ee524 authored by Tomeu Vizoso's avatar Tomeu Vizoso Committed by Daniel Vetter

drm/i915: Put "cooked" vlank counters in frame CRC lines

Use drm_accurate_vblank_count so we have the full 32 bit to represent
the frame counter and userspace has a simpler way of knowing when the
counter wraps around.
Signed-off-by: default avatarTomeu Vizoso <tomeu.vizoso@collabora.com>
Reviewed-by: default avatarEmil Velikov <emil.velikov@collabora.com>
Reviewed-by: default avatarRobert Foss <robert.foss@collabora.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/20170110134305.26326-3-tomeu.vizoso@collabora.com
parent 8c6b709d
...@@ -1557,7 +1557,6 @@ static void display_pipe_crc_irq_handler(struct drm_i915_private *dev_priv, ...@@ -1557,7 +1557,6 @@ static void display_pipe_crc_irq_handler(struct drm_i915_private *dev_priv,
struct drm_driver *driver = dev_priv->drm.driver; struct drm_driver *driver = dev_priv->drm.driver;
uint32_t crcs[5]; uint32_t crcs[5];
int head, tail; int head, tail;
u32 frame;
spin_lock(&pipe_crc->lock); spin_lock(&pipe_crc->lock);
if (pipe_crc->source) { if (pipe_crc->source) {
...@@ -1612,8 +1611,9 @@ static void display_pipe_crc_irq_handler(struct drm_i915_private *dev_priv, ...@@ -1612,8 +1611,9 @@ static void display_pipe_crc_irq_handler(struct drm_i915_private *dev_priv,
crcs[2] = crc2; crcs[2] = crc2;
crcs[3] = crc3; crcs[3] = crc3;
crcs[4] = crc4; crcs[4] = crc4;
frame = driver->get_vblank_counter(&dev_priv->drm, pipe); drm_crtc_add_crc_entry(&crtc->base, true,
drm_crtc_add_crc_entry(&crtc->base, true, frame, crcs); drm_accurate_vblank_count(&crtc->base),
crcs);
} }
} }
#else #else
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment