From: Ville Syrjälä <ville.syrj...@linux.intel.com>

Initialise delayed vblank position for evasion logic.

Signed-off-by: Ville Syrjälä <ville.syrj...@linux.intel.com>
Signed-off-by: Mitul Golani <mitulkumar.ajitkumar.gol...@intel.com>
Reviewed-by: Ankit Nautiyal <ankit.k.nauti...@intel.com>
---
 drivers/gpu/drm/i915/display/intel_vblank.c | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_vblank.c 
b/drivers/gpu/drm/i915/display/intel_vblank.c
index 139fa5deba80..680013f00fc0 100644
--- a/drivers/gpu/drm/i915/display/intel_vblank.c
+++ b/drivers/gpu/drm/i915/display/intel_vblank.c
@@ -642,6 +642,14 @@ intel_pre_commit_crtc_state(struct intel_atomic_state 
*state,
        return pre_commit_crtc_state(old_crtc_state, new_crtc_state);
 }
 
+static int vrr_vblank_start(const struct intel_crtc_state *crtc_state)
+{
+       if (intel_vrr_is_push_sent(crtc_state))
+               return intel_vrr_vmin_vblank_start(crtc_state);
+       else
+               return intel_vrr_vmax_vblank_start(crtc_state);
+}
+
 void intel_vblank_evade_init(const struct intel_crtc_state *old_crtc_state,
                             const struct intel_crtc_state *new_crtc_state,
                             struct intel_vblank_evade_ctx *evade)
@@ -668,10 +676,7 @@ void intel_vblank_evade_init(const struct intel_crtc_state 
*old_crtc_state,
                drm_WARN_ON(crtc->base.dev, 
intel_crtc_needs_modeset(new_crtc_state) ||
                            new_crtc_state->update_m_n || 
new_crtc_state->update_lrr);
 
-               if (intel_vrr_is_push_sent(crtc_state))
-                       evade->vblank_start = 
intel_vrr_vmin_vblank_start(crtc_state);
-               else
-                       evade->vblank_start = 
intel_vrr_vmax_vblank_start(crtc_state);
+               evade->vblank_start = vrr_vblank_start(crtc_state);
 
                vblank_delay = intel_vrr_vblank_delay(crtc_state);
        } else {
-- 
2.48.1

Reply via email to