drm/i915/vblank: add and use intel_de_read64_2x32() to read vblank counter

Add intel_de_read64_2x32() wrapper for the uncore version of the same,
and use it to read the high and low frame registers. Avoid duplicating
code for existing helpers.

The slight functional difference is checking that the entire high
register remains the same across two reads, instead of just the part
we're interested in. This should be of no consequence. (Unless those
bits function as a PRNG.)

Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/33853549adff82045b95af527e14cfdff5712470.1673873708.git.jani.nikula@intel.com

diff --git a/drivers/gpu/drm/i915/display/intel_de.h b/drivers/gpu/drm/i915/display/intel_de.h
index 3dbd76fdabd651d7193881b3c5a82a9e5c4725b0..42552d8c151e868e30b0bd58cce80d85ef359e42 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_de.h
+++ b/drivers/gpu/drm/i915/display/intel_de.h
@@ -22,6 +22,13 @@ intel_de_read8(struct drm_i915_private *i915, i915_reg_t reg)
        return intel_uncore_read8(&i915->uncore, reg);
 }
 
+static inline u64
+intel_de_read64_2x32(struct drm_i915_private *i915,
+                    i915_reg_t lower_reg, i915_reg_t upper_reg)
+{
+       return intel_uncore_read64_2x32(&i915->uncore, lower_reg, upper_reg);
+}
+
 static inline void
 intel_de_posting_read(struct drm_i915_private *i915, i915_reg_t reg)
 {

diff --git a/drivers/gpu/drm/i915/display/intel_vblank.c b/drivers/gpu/drm/i915/display/intel_vblank.c
index b2d4d289aaa799b1af983197d205f8365b94614f..4c83e2320bcacc4f4238cebeac0119f600d67d5f 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_vblank.c
+++ b/drivers/gpu/drm/i915/display/intel_vblank.c
@@ -68,9 +68,8 @@ u32 i915_get_vblank_counter(struct drm_crtc *crtc)
        struct drm_vblank_crtc *vblank = &dev_priv->drm.vblank[drm_crtc_index(crtc)];
        const struct drm_display_mode *mode = &vblank->hwmode;
        enum pipe pipe = to_intel_crtc(crtc)->pipe;
-       i915_reg_t high_frame, low_frame;
-       u32 high1, high2, low, pixel, vbl_start, hsync_start, htotal;
-       unsigned long irqflags;
+       u32 pixel, vbl_start, hsync_start, htotal;
+       u64 frame;
 
        /*
         * On i965gm TV output the frame counter only works up to
@@ -98,34 +97,22 @@ u32 i915_get_vblank_counter(struct drm_crtc *crtc)
        /* Start of vblank event occurs at start of hsync */
        vbl_start -= htotal - hsync_start;
 
-       high_frame = PIPEFRAME(pipe);
-       low_frame = PIPEFRAMEPIXEL(pipe);
-
-       spin_lock_irqsave(&dev_priv->uncore.lock, irqflags);
-
        /*
         * High & low register fields aren't synchronized, so make sure
         * we get a low value that's stable across two reads of the high
         * register.
         */
-       do {
-               high1 = intel_de_read_fw(dev_priv, high_frame) & PIPE_FRAME_HIGH_MASK;
-               low   = intel_de_read_fw(dev_priv, low_frame);
-               high2 = intel_de_read_fw(dev_priv, high_frame) & PIPE_FRAME_HIGH_MASK;
-       } while (high1 != high2);
-
-       spin_unlock_irqrestore(&dev_priv->uncore.lock, irqflags);
+       frame = intel_de_read64_2x32(dev_priv, PIPEFRAMEPIXEL(pipe), PIPEFRAME(pipe));
 
-       high1 >>= PIPE_FRAME_HIGH_SHIFT;
-       pixel = low & PIPE_PIXEL_MASK;
-       low >>= PIPE_FRAME_LOW_SHIFT;
+       pixel = frame & PIPE_PIXEL_MASK;
+       frame = (frame >> PIPE_FRAME_LOW_SHIFT) & 0xffffff;
 
        /*
         * The frame counter increments at beginning of active.
         * Cook up a vblank counter by also checking the pixel
         * counter against vblank start.
         */
-       return (((high1 << 8) | low) + (pixel >= vbl_start)) & 0xffffff;
+       return (frame + (pixel >= vbl_start)) & 0xffffff;
 }
 
 u32 g4x_get_vblank_counter(struct drm_crtc *crtc)