drm: Pass the display mode to drm_calc_timestamping_constants()

We don't really use hwmode anymore in i915, so eliminating its use
from the core code seems prudent. Just pass the appropriate mode
to drm_calc_timestamping_constants().

Reviewed-by: mario.kleiner.de@gmail.com
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>

4 files changed, 14 insertions, 11 deletions

diff --git a/drivers/gpu/drm/drm_crtc_helper.c b/drivers/gpu/drm/drm_crtc_helper.c
index 01361aba033b..245fe4fa9c9e 100644
--- a/drivers/gpu/drm/drm_crtc_helper.c
+++ b/drivers/gpu/drm/drm_crtc_helper.c
@@ -536,7 +536,7 @@ bool drm_crtc_helper_set_mode(struct drm_crtc *crtc,
          * are later needed by vblank and swap-completion
          * timestamping. They are derived from true hwmode.
          */
-        drm_calc_timestamping_constants(crtc);
+        drm_calc_timestamping_constants(crtc, &crtc->hwmode);
 
         /* FIXME: add subpixel order */
 done:
diff --git a/drivers/gpu/drm/drm_irq.c b/drivers/gpu/drm/drm_irq.c
index e7de2da57234..3837132086f0 100644
--- a/drivers/gpu/drm/drm_irq.c
+++ b/drivers/gpu/drm/drm_irq.c
@@ -445,20 +445,22 @@ int drm_control(struct drm_device *dev, void *data,
  * adjustments into account.
  *
  * @crtc drm_crtc whose timestamp constants should be updated.
+ * @mode display mode containing the scanout timings
  *
  */
-void drm_calc_timestamping_constants(struct drm_crtc *crtc)
+void drm_calc_timestamping_constants(struct drm_crtc *crtc,
+                                     const struct drm_display_mode *mode)
 {
         s64 linedur_ns = 0, pixeldur_ns = 0, framedur_ns = 0;
         u64 dotclock;
 
         /* Dot clock in Hz: */
-        dotclock = (u64) crtc->hwmode.clock * 1000;
+        dotclock = (u64) mode->clock * 1000;
 
         /* Fields of interlaced scanout modes are only half a frame duration.
          * Double the dotclock to get half the frame-/line-/pixelduration.
          */
-        if (crtc->hwmode.flags & DRM_MODE_FLAG_INTERLACE)
+        if (mode->flags & DRM_MODE_FLAG_INTERLACE)
                 dotclock *= 2;
 
         /* Valid dotclock? */
@@ -469,10 +471,9 @@ void drm_calc_timestamping_constants(struct drm_crtc *crtc)
                  * nanoseconds:
                  */
                 pixeldur_ns = (s64) div64_u64(1000000000, dotclock);
-                linedur_ns  = (s64) div64_u64(((u64) crtc->hwmode.crtc_htotal *
+                linedur_ns  = (s64) div64_u64(((u64) mode->crtc_htotal *
                                               1000000000), dotclock);
-                frame_size = crtc->hwmode.crtc_htotal *
-                                crtc->hwmode.crtc_vtotal;
+                frame_size = mode->crtc_htotal * mode->crtc_vtotal;
                 framedur_ns = (s64) div64_u64((u64) frame_size * 1000000000,
                                               dotclock);
         } else
@@ -484,8 +485,8 @@ void drm_calc_timestamping_constants(struct drm_crtc *crtc)
         crtc->framedur_ns = framedur_ns;
 
         DRM_DEBUG("crtc %d: hwmode: htotal %d, vtotal %d, vdisplay %d\n",
-                  crtc->base.id, crtc->hwmode.crtc_htotal,
-                  crtc->hwmode.crtc_vtotal, crtc->hwmode.crtc_vdisplay);
+                  crtc->base.id, mode->crtc_htotal,
+                  mode->crtc_vtotal, mode->crtc_vdisplay);
         DRM_DEBUG("crtc %d: clock %d kHz framedur %d linedur %d, pixeldur %d\n",
                   crtc->base.id, (int) dotclock/1000, (int) framedur_ns,
                   (int) linedur_ns, (int) pixeldur_ns);
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index e77d4b8856a7..920fcff8818c 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -9693,7 +9693,8 @@ static int __intel_set_mode(struct drm_crtc *crtc,
                  * are later needed by vblank and swap-completion
                  * timestamping. They are derived from true hwmode.
                  */
-                drm_calc_timestamping_constants(crtc);
+                drm_calc_timestamping_constants(crtc,
+                                                &pipe_config->adjusted_mode);
         }
 
         /* FIXME: add subpixel order */
diff --git a/include/drm/drmP.h b/include/drm/drmP.h
index 63eab2b72ee7..46bf8ae7e302 100644
--- a/include/drm/drmP.h
+++ b/include/drm/drmP.h
@@ -1402,7 +1402,8 @@ extern int drm_calc_vbltimestamp_from_scanoutpos(struct drm_device *dev,
                                                  struct timeval *vblank_time,
                                                  unsigned flags,
                                                  struct drm_crtc *refcrtc);
-extern void drm_calc_timestamping_constants(struct drm_crtc *crtc);
+extern void drm_calc_timestamping_constants(struct drm_crtc *crtc,
+                                            const struct drm_display_mode *mode);
 
 extern bool
 drm_mode_parse_command_line_for_connector(const char *mode_option,