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: Tomeu Vizoso <[email protected]>
Reviewed-by: Emil Velikov <[email protected]>
Reviewed-by: Robert Foss <[email protected]>
Signed-off-by: Daniel Vetter <[email protected]>
Link: http://patchwork.freedesktop.org/patch/msgid/[email protected]

diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
index b9beb5955daea259920c051d90b3fffb8c6b7efd..75fb1f66cc0cb32c6f6051b0ef58d34aa6132f69 100644 (file)
--- a/drivers/gpu/drm/i915/i915_irq.c
+++ b/drivers/gpu/drm/i915/i915_irq.c
@@ -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;
        uint32_t crcs[5];
        int head, tail;
-       u32 frame;
 
        spin_lock(&pipe_crc->lock);
        if (pipe_crc->source) {
@@ -1612,8 +1611,9 @@ static void display_pipe_crc_irq_handler(struct drm_i915_private *dev_priv,
                crcs[2] = crc2;
                crcs[3] = crc3;
                crcs[4] = crc4;
-               frame = driver->get_vblank_counter(&dev_priv->drm, pipe);
-               drm_crtc_add_crc_entry(&crtc->base, true, frame, crcs);
+               drm_crtc_add_crc_entry(&crtc->base, true,
+                                      drm_accurate_vblank_count(&crtc->base),
+                                      crcs);
        }
 }
 #else