drm/i915: Relocate intel_crtc_update_active_timings()
authorVille Syrjälä <ville.syrjala@linux.intel.com>
Fri, 10 Mar 2023 23:58:27 +0000 (01:58 +0200)
committerVille Syrjälä <ville.syrjala@linux.intel.com>
Sat, 18 Mar 2023 12:24:57 +0000 (14:24 +0200)
Move intel_crtc_update_active_timings() into intel_vblank.c
where it more properly belongs.

Also do the s/dev_priv/i915/ modernization rename while at it.

Reviewed-by: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: Mitul Golani <mitulkumar.ajitkumar.golani@intel.com>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230310235828.17439-3-ville.syrjala@linux.intel.com
drivers/gpu/drm/i915/display/intel_display.c
drivers/gpu/drm/i915/display/intel_display.h
drivers/gpu/drm/i915/display/intel_modeset_setup.c
drivers/gpu/drm/i915/display/intel_vblank.c
drivers/gpu/drm/i915/display/intel_vblank.h

index 4fd64dcfaf1248776e8f05c0d996e55b22cded81..e044b97a516b049b9e98ac830d76e7792437fa9b 100644 (file)
@@ -5902,90 +5902,6 @@ int intel_modeset_all_pipes(struct intel_atomic_state *state,
        return 0;
 }
 
-void intel_crtc_update_active_timings(const struct intel_crtc_state *crtc_state)
-{
-       struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc);
-       struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
-       struct drm_display_mode adjusted_mode;
-       int vmax_vblank_start = 0;
-       unsigned long irqflags;
-
-       drm_mode_init(&adjusted_mode, &crtc_state->hw.adjusted_mode);
-
-       if (crtc_state->vrr.enable) {
-               adjusted_mode.crtc_vtotal = crtc_state->vrr.vmax;
-               adjusted_mode.crtc_vblank_end = crtc_state->vrr.vmax;
-               adjusted_mode.crtc_vblank_start = intel_vrr_vmin_vblank_start(crtc_state);
-               vmax_vblank_start = intel_vrr_vmax_vblank_start(crtc_state);
-       }
-
-       /*
-        * Belts and suspenders locking to guarantee everyone sees 100%
-        * consistent state during fastset seamless refresh rate changes.
-        *
-        * vblank_time_lock takes care of all drm_vblank.c stuff, and
-        * uncore.lock takes care of __intel_get_crtc_scanline() which
-        * may get called elsewhere as well.
-        *
-        * TODO maybe just protect everything (including
-        * __intel_get_crtc_scanline()) with vblank_time_lock?
-        * Need to audit everything to make sure it's safe.
-        */
-       spin_lock_irqsave(&dev_priv->drm.vblank_time_lock, irqflags);
-       spin_lock(&dev_priv->uncore.lock);
-
-       drm_calc_timestamping_constants(&crtc->base, &adjusted_mode);
-
-       crtc->vmax_vblank_start = vmax_vblank_start;
-
-       crtc->mode_flags = crtc_state->mode_flags;
-
-       /*
-        * The scanline counter increments at the leading edge of hsync.
-        *
-        * On most platforms it starts counting from vtotal-1 on the
-        * first active line. That means the scanline counter value is
-        * always one less than what we would expect. Ie. just after
-        * start of vblank, which also occurs at start of hsync (on the
-        * last active line), the scanline counter will read vblank_start-1.
-        *
-        * On gen2 the scanline counter starts counting from 1 instead
-        * of vtotal-1, so we have to subtract one (or rather add vtotal-1
-        * to keep the value positive), instead of adding one.
-        *
-        * On HSW+ the behaviour of the scanline counter depends on the output
-        * type. For DP ports it behaves like most other platforms, but on HDMI
-        * there's an extra 1 line difference. So we need to add two instead of
-        * one to the value.
-        *
-        * On VLV/CHV DSI the scanline counter would appear to increment
-        * approx. 1/3 of a scanline before start of vblank. Unfortunately
-        * that means we can't tell whether we're in vblank or not while
-        * we're on that particular line. We must still set scanline_offset
-        * to 1 so that the vblank timestamps come out correct when we query
-        * the scanline counter from within the vblank interrupt handler.
-        * However if queried just before the start of vblank we'll get an
-        * answer that's slightly in the future.
-        */
-       if (DISPLAY_VER(dev_priv) == 2) {
-               int vtotal;
-
-               vtotal = adjusted_mode.crtc_vtotal;
-               if (adjusted_mode.flags & DRM_MODE_FLAG_INTERLACE)
-                       vtotal /= 2;
-
-               crtc->scanline_offset = vtotal - 1;
-       } else if (HAS_DDI(dev_priv) &&
-                  intel_crtc_has_type(crtc_state, INTEL_OUTPUT_HDMI)) {
-               crtc->scanline_offset = 2;
-       } else {
-               crtc->scanline_offset = 1;
-       }
-
-       spin_unlock(&dev_priv->uncore.lock);
-       spin_unlock_irqrestore(&dev_priv->drm.vblank_time_lock, irqflags);
-}
-
 /*
  * This implements the workaround described in the "notes" section of the mode
  * set sequence documentation. When going from no pipes or single pipe to
index beef930ebfbb9010b468d61bdac63837ed07291a..596fd3ec19838f47d8e94bccfca4176034d9b688 100644 (file)
@@ -422,7 +422,6 @@ bool intel_crtc_get_pipe_config(struct intel_crtc_state *crtc_state);
 bool intel_pipe_config_compare(const struct intel_crtc_state *current_config,
                               const struct intel_crtc_state *pipe_config,
                               bool fastset);
-void intel_crtc_update_active_timings(const struct intel_crtc_state *crtc_state);
 
 void intel_plane_destroy(struct drm_plane *plane);
 void i9xx_set_pipeconf(const struct intel_crtc_state *crtc_state);
index 1d0c9e247c425b5a5832f3732b2c10741aee0e45..4558d02641fe1745a167700ca7f3a5edd25c8c5f 100644 (file)
@@ -26,6 +26,7 @@
 #include "intel_fifo_underrun.h"
 #include "intel_modeset_setup.h"
 #include "intel_pch_display.h"
+#include "intel_vblank.h"
 #include "intel_wm.h"
 #include "skl_watermark.h"
 
index 571f5dda1e66b65090eb6e155b16d8fd473770d1..48bf3923af11c602b3d601fcb7416ede434329ca 100644 (file)
@@ -8,6 +8,7 @@
 #include "intel_de.h"
 #include "intel_display_types.h"
 #include "intel_vblank.h"
+#include "intel_vrr.h"
 
 /*
  * This timing diagram depicts the video signal in and
@@ -439,3 +440,87 @@ void intel_wait_for_pipe_scanline_moving(struct intel_crtc *crtc)
 {
        wait_for_pipe_scanline_moving(crtc, true);
 }
+
+void intel_crtc_update_active_timings(const struct intel_crtc_state *crtc_state)
+{
+       struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc);
+       struct drm_i915_private *i915 = to_i915(crtc->base.dev);
+       struct drm_display_mode adjusted_mode;
+       int vmax_vblank_start = 0;
+       unsigned long irqflags;
+
+       drm_mode_init(&adjusted_mode, &crtc_state->hw.adjusted_mode);
+
+       if (crtc_state->vrr.enable) {
+               adjusted_mode.crtc_vtotal = crtc_state->vrr.vmax;
+               adjusted_mode.crtc_vblank_end = crtc_state->vrr.vmax;
+               adjusted_mode.crtc_vblank_start = intel_vrr_vmin_vblank_start(crtc_state);
+               vmax_vblank_start = intel_vrr_vmax_vblank_start(crtc_state);
+       }
+
+       /*
+        * Belts and suspenders locking to guarantee everyone sees 100%
+        * consistent state during fastset seamless refresh rate changes.
+        *
+        * vblank_time_lock takes care of all drm_vblank.c stuff, and
+        * uncore.lock takes care of __intel_get_crtc_scanline() which
+        * may get called elsewhere as well.
+        *
+        * TODO maybe just protect everything (including
+        * __intel_get_crtc_scanline()) with vblank_time_lock?
+        * Need to audit everything to make sure it's safe.
+        */
+       spin_lock_irqsave(&i915->drm.vblank_time_lock, irqflags);
+       spin_lock(&i915->uncore.lock);
+
+       drm_calc_timestamping_constants(&crtc->base, &adjusted_mode);
+
+       crtc->vmax_vblank_start = vmax_vblank_start;
+
+       crtc->mode_flags = crtc_state->mode_flags;
+
+       /*
+        * The scanline counter increments at the leading edge of hsync.
+        *
+        * On most platforms it starts counting from vtotal-1 on the
+        * first active line. That means the scanline counter value is
+        * always one less than what we would expect. Ie. just after
+        * start of vblank, which also occurs at start of hsync (on the
+        * last active line), the scanline counter will read vblank_start-1.
+        *
+        * On gen2 the scanline counter starts counting from 1 instead
+        * of vtotal-1, so we have to subtract one (or rather add vtotal-1
+        * to keep the value positive), instead of adding one.
+        *
+        * On HSW+ the behaviour of the scanline counter depends on the output
+        * type. For DP ports it behaves like most other platforms, but on HDMI
+        * there's an extra 1 line difference. So we need to add two instead of
+        * one to the value.
+        *
+        * On VLV/CHV DSI the scanline counter would appear to increment
+        * approx. 1/3 of a scanline before start of vblank. Unfortunately
+        * that means we can't tell whether we're in vblank or not while
+        * we're on that particular line. We must still set scanline_offset
+        * to 1 so that the vblank timestamps come out correct when we query
+        * the scanline counter from within the vblank interrupt handler.
+        * However if queried just before the start of vblank we'll get an
+        * answer that's slightly in the future.
+        */
+       if (DISPLAY_VER(i915) == 2) {
+               int vtotal;
+
+               vtotal = adjusted_mode.crtc_vtotal;
+               if (adjusted_mode.flags & DRM_MODE_FLAG_INTERLACE)
+                       vtotal /= 2;
+
+               crtc->scanline_offset = vtotal - 1;
+       } else if (HAS_DDI(i915) &&
+                  intel_crtc_has_type(crtc_state, INTEL_OUTPUT_HDMI)) {
+               crtc->scanline_offset = 2;
+       } else {
+               crtc->scanline_offset = 1;
+       }
+
+       spin_unlock(&i915->uncore.lock);
+       spin_unlock_irqrestore(&i915->drm.vblank_time_lock, irqflags);
+}
index c9fea2c2a99073a8bceef0f871c273dc9baba4bf..0884db7e76ae04966151205b3fb4153a8100f4eb 100644 (file)
@@ -11,6 +11,7 @@
 
 struct drm_crtc;
 struct intel_crtc;
+struct intel_crtc_state;
 
 u32 i915_get_vblank_counter(struct drm_crtc *crtc);
 u32 g4x_get_vblank_counter(struct drm_crtc *crtc);
@@ -19,5 +20,6 @@ bool intel_crtc_get_vblank_timestamp(struct drm_crtc *crtc, int *max_error,
 int intel_get_crtc_scanline(struct intel_crtc *crtc);
 void intel_wait_for_pipe_scanline_stopped(struct intel_crtc *crtc);
 void intel_wait_for_pipe_scanline_moving(struct intel_crtc *crtc);
+void intel_crtc_update_active_timings(const struct intel_crtc_state *crtc_state);
 
 #endif /* __INTEL_VBLANK_H__ */