1 files changed, 13 insertions, 49 deletions

diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
index fd97fe00cd0d..04493ef1d2f7 100644
--- a/drivers/gpu/drm/i915/i915_irq.c
+++ b/drivers/gpu/drm/i915/i915_irq.c
@@ -720,9 +720,7 @@ static u32 i915_get_vblank_counter(struct drm_device *dev, unsigned int pipe)
         struct drm_i915_private *dev_priv = to_i915(dev);
         i915_reg_t high_frame, low_frame;
         u32 high1, high2, low, pixel, vbl_start, hsync_start, htotal;
-        struct intel_crtc *intel_crtc = intel_get_crtc_for_pipe(dev_priv,
-                                                                pipe);
-        const struct drm_display_mode *mode = &intel_crtc->base.hwmode;
+        const struct drm_display_mode *mode = &dev->vblank[pipe].hwmode;
         unsigned long irqflags;
 
         htotal = mode->crtc_htotal;
@@ -779,13 +777,17 @@ static int __intel_get_crtc_scanline(struct intel_crtc *crtc)
 {
         struct drm_device *dev = crtc->base.dev;
         struct drm_i915_private *dev_priv = to_i915(dev);
-        const struct drm_display_mode *mode = &crtc->base.hwmode;
+        const struct drm_display_mode *mode;
+        struct drm_vblank_crtc *vblank;
         enum pipe pipe = crtc->pipe;
         int position, vtotal;
 
         if (!crtc->active)
                 return -1;
 
+        vblank = &crtc->base.dev->vblank[drm_crtc_index(&crtc->base)];
+        mode = &vblank->hwmode;
+
         vtotal = mode->crtc_vtotal;
         if (mode->flags & DRM_MODE_FLAG_INTERLACE)
                 vtotal /= 2;
@@ -827,10 +829,10 @@ static int __intel_get_crtc_scanline(struct intel_crtc *crtc)
         return (position + crtc->scanline_offset) % vtotal;
 }
 
-static int i915_get_crtc_scanoutpos(struct drm_device *dev, unsigned int pipe,
-                                    unsigned int flags, int *vpos, int *hpos,
-                                    ktime_t *stime, ktime_t *etime,
-                                    const struct drm_display_mode *mode)
+static bool i915_get_crtc_scanoutpos(struct drm_device *dev, unsigned int pipe,
+                                     bool in_vblank_irq, int *vpos, int *hpos,
+                                     ktime_t *stime, ktime_t *etime,
+                                     const struct drm_display_mode *mode)
 {
         struct drm_i915_private *dev_priv = to_i915(dev);
         struct intel_crtc *intel_crtc = intel_get_crtc_for_pipe(dev_priv,
@@ -838,13 +840,12 @@ static int i915_get_crtc_scanoutpos(struct drm_device *dev, unsigned int pipe,
         int position;
         int vbl_start, vbl_end, hsync_start, htotal, vtotal;
         bool in_vbl = true;
-        int ret = 0;
         unsigned long irqflags;
 
         if (WARN_ON(!mode->crtc_clock)) {
                 DRM_DEBUG_DRIVER("trying to get scanoutpos for disabled "
                                  "pipe %c\n", pipe_name(pipe));
-                return 0;
+                return false;
         }
 
         htotal = mode->crtc_htotal;
@@ -859,8 +860,6 @@ static int i915_get_crtc_scanoutpos(struct drm_device *dev, unsigned int pipe,
                 vtotal /= 2;
         }
 
-        ret |= DRM_SCANOUTPOS_VALID | DRM_SCANOUTPOS_ACCURATE;
-
         /*
          * Lock uncore.lock, as we will do multiple timing critical raw
          * register reads, potentially with preemption disabled, so the
@@ -944,11 +943,7 @@ static int i915_get_crtc_scanoutpos(struct drm_device *dev, unsigned int pipe,
                 *hpos = position - (*vpos * htotal);
         }
 
-        /* In vblank? */
-        if (in_vbl)
-                ret |= DRM_SCANOUTPOS_IN_VBLANK;
-
-        return ret;
+        return true;
 }
 
 int intel_get_crtc_scanline(struct intel_crtc *crtc)
@@ -964,37 +959,6 @@ int intel_get_crtc_scanline(struct intel_crtc *crtc)
         return position;
 }
 
-static int i915_get_vblank_timestamp(struct drm_device *dev, unsigned int pipe,
-                              int *max_error,
-                              struct timeval *vblank_time,
-                              unsigned flags)
-{
-        struct drm_i915_private *dev_priv = to_i915(dev);
-        struct intel_crtc *crtc;
-
-        if (pipe >= INTEL_INFO(dev_priv)->num_pipes) {
-                DRM_ERROR("Invalid crtc %u\n", pipe);
-                return -EINVAL;
-        }
-
-        /* Get drm_crtc to timestamp: */
-        crtc = intel_get_crtc_for_pipe(dev_priv, pipe);
-        if (crtc == NULL) {
-                DRM_ERROR("Invalid crtc %u\n", pipe);
-                return -EINVAL;
-        }
-
-        if (!crtc->base.hwmode.crtc_clock) {
-                DRM_DEBUG_KMS("crtc %u is disabled\n", pipe);
-                return -EBUSY;
-        }
-
-        /* Helper routine in DRM core does all the work: */
-        return drm_calc_vbltimestamp_from_scanoutpos(dev, pipe, max_error,
-                                                     vblank_time, flags,
-                                                     &crtc->base.hwmode);
-}
-
 static void ironlake_rps_change_irq_handler(struct drm_i915_private *dev_priv)
 {
         u32 busy_up, busy_down, max_avg, min_avg;
@@ -4294,7 +4258,7 @@ void intel_irq_init(struct drm_i915_private *dev_priv)
 
         dev_priv->hotplug.hpd_storm_threshold = HPD_STORM_DEFAULT_THRESHOLD;
 
-        dev->driver->get_vblank_timestamp = i915_get_vblank_timestamp;
+        dev->driver->get_vblank_timestamp = drm_calc_vbltimestamp_from_scanoutpos;
         dev->driver->get_scanout_position = i915_get_crtc_scanoutpos;
 
         if (IS_CHERRYVIEW(dev_priv)) {