drm/i915/vrr: Introduce intel_vrr_vblank_delay()

Introduce a VRR specific function for determining the current
vblank delay. Currently thus will give the same answer as
intel_mode_vblank_delay() but that will change later.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20241210211007.5976-13-ville.syrjala@linux.intel.com
Reviewed-by: Ankit Nautiyal <ankit.k.nautiyal@intel.com>

diff --git a/drivers/gpu/drm/i915/display/intel_dsb.c b/drivers/gpu/drm/i915/display/intel_dsb.c
index 673f7570378594dbca883d4ab3fe488b19e224dd..89d3496bcbdbdfca377cd872eee0fdf67e0316ab 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_dsb.c
+++ b/drivers/gpu/drm/i915/display/intel_dsb.c
@@ -109,9 +109,16 @@ static bool pre_commit_is_vrr_active(struct intel_atomic_state *state,
        return old_crtc_state->vrr.enable && !intel_crtc_vrr_disabling(state, crtc);
 }
 
-static int dsb_vblank_delay(const struct intel_crtc_state *crtc_state)
+static int dsb_vblank_delay(struct intel_atomic_state *state,
+                           struct intel_crtc *crtc)
 {
-       return intel_mode_vblank_delay(&crtc_state->hw.adjusted_mode);
+       const struct intel_crtc_state *crtc_state =
+               intel_pre_commit_crtc_state(state, crtc);
+
+       if (pre_commit_is_vrr_active(state, crtc))
+               return intel_vrr_vblank_delay(crtc_state);
+       else
+               return intel_mode_vblank_delay(&crtc_state->hw.adjusted_mode);
 }
 
 static int dsb_vtotal(struct intel_atomic_state *state,
@@ -520,10 +527,11 @@ void intel_dsb_vblank_evade(struct intel_atomic_state *state,
                intel_pre_commit_crtc_state(state, crtc);
        /* FIXME calibrate sensibly */
        int latency = intel_usecs_to_scanlines(&crtc_state->hw.adjusted_mode, 20);
-       int vblank_delay = dsb_vblank_delay(crtc_state);
        int start, end;
 
        if (pre_commit_is_vrr_active(state, crtc)) {
+               int vblank_delay = intel_vrr_vblank_delay(crtc_state);
+
                end = intel_vrr_vmin_vblank_start(crtc_state);
                start = end - vblank_delay - latency;
                intel_dsb_wait_scanline_out(state, dsb, start, end);
@@ -532,6 +540,8 @@ void intel_dsb_vblank_evade(struct intel_atomic_state *state,
                start = end - vblank_delay - latency;
                intel_dsb_wait_scanline_out(state, dsb, start, end);
        } else {
+               int vblank_delay = intel_mode_vblank_delay(&crtc_state->hw.adjusted_mode);
+
                end = intel_mode_vblank_start(&crtc_state->hw.adjusted_mode);
                start = end - vblank_delay - latency;
                intel_dsb_wait_scanline_out(state, dsb, start, end);
@@ -612,7 +622,7 @@ void intel_dsb_wait_vblank_delay(struct intel_atomic_state *state,
        const struct intel_crtc_state *crtc_state =
                intel_pre_commit_crtc_state(state, crtc);
        int usecs = intel_scanlines_to_usecs(&crtc_state->hw.adjusted_mode,
-                                            dsb_vblank_delay(crtc_state)) + 1;
+                                            dsb_vblank_delay(state, crtc)) + 1;
 
        intel_dsb_wait_usec(dsb, usecs);
 }

diff --git a/drivers/gpu/drm/i915/display/intel_vblank.c b/drivers/gpu/drm/i915/display/intel_vblank.c
index 2a99bde457dbdfe9c97091f2ea18ea781aab3594..fb80e0bef08a11c9cceb9033c78ac9a03b582f27 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_vblank.c
+++ b/drivers/gpu/drm/i915/display/intel_vblank.c
@@ -647,6 +647,7 @@ void intel_vblank_evade_init(const struct intel_crtc_state *old_crtc_state,
        struct intel_crtc *crtc = to_intel_crtc(new_crtc_state->uapi.crtc);
        const struct intel_crtc_state *crtc_state;
        const struct drm_display_mode *adjusted_mode;
+       int vblank_delay;
 
        evade->crtc = crtc;
 
@@ -668,8 +669,12 @@ void intel_vblank_evade_init(const struct intel_crtc_state *old_crtc_state,
                        evade->vblank_start = intel_vrr_vmin_vblank_start(crtc_state);
                else
                        evade->vblank_start = intel_vrr_vmax_vblank_start(crtc_state);
+
+               vblank_delay = intel_vrr_vblank_delay(crtc_state);
        } else {
                evade->vblank_start = intel_mode_vblank_start(adjusted_mode);
+
+               vblank_delay = intel_mode_vblank_delay(adjusted_mode);
        }
 
        /* FIXME needs to be calibrated sensibly */
@@ -687,7 +692,7 @@ void intel_vblank_evade_init(const struct intel_crtc_state *old_crtc_state,
         */
        if (intel_color_uses_dsb(new_crtc_state) ||
            new_crtc_state->update_m_n || new_crtc_state->update_lrr)
-               evade->min -= intel_mode_vblank_delay(adjusted_mode);
+               evade->min -= vblank_delay;
 }
 
 /* must be called with vblank interrupt already enabled! */

diff --git a/drivers/gpu/drm/i915/display/intel_vrr.c b/drivers/gpu/drm/i915/display/intel_vrr.c
index 2e9c286bb0799f098fddfa746964df5465365fd0..05da10919ba867d9193d751237de1a9a4f72513a 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_vrr.c
+++ b/drivers/gpu/drm/i915/display/intel_vrr.c
@@ -75,6 +75,12 @@ intel_vrr_check_modeset(struct intel_atomic_state *state)
        }
 }
 
+int intel_vrr_vblank_delay(const struct intel_crtc_state *crtc_state)
+{
+       return crtc_state->hw.adjusted_mode.crtc_vblank_start -
+               crtc_state->hw.adjusted_mode.crtc_vdisplay;
+}
+
 /*
  * Without VRR registers get latched at:
  *  vblank_start

diff --git a/drivers/gpu/drm/i915/display/intel_vrr.h b/drivers/gpu/drm/i915/display/intel_vrr.h
index 75db88ae9cc4451ef809e4d1691acbcd7a68f4f4..8e8961adce392aef7d31d20cd9b970b97277167e 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_vrr.h
+++ b/drivers/gpu/drm/i915/display/intel_vrr.h
@@ -30,5 +30,6 @@ int intel_vrr_vmax_vtotal(const struct intel_crtc_state *crtc_state);
 int intel_vrr_vmin_vtotal(const struct intel_crtc_state *crtc_state);
 int intel_vrr_vmax_vblank_start(const struct intel_crtc_state *crtc_state);
 int intel_vrr_vmin_vblank_start(const struct intel_crtc_state *crtc_state);
+int intel_vrr_vblank_delay(const struct intel_crtc_state *crtc_state);
 
 #endif /* __INTEL_VRR_H__ */