[PATCH 3/4] drm/i915/vrr: Set vrr.vmin to min Vtotal

[Golani, Mitulkumar Ajitkumar]

> -----Original Message-----
> From: Intel-gfx <intel-gfx-bounces at lists.freedesktop.org> On Behalf Of Ankit
> Nautiyal
> Sent: 07 July 2025 11:33
> To: intel-gfx at lists.freedesktop.org; intel-xe at lists.freedesktop.org
> Cc: ville.syrjala at linux.intel.com; Nautiyal, Ankit K <ankit.k.nautiyal at intel.com>
> Subject: [PATCH 3/4] drm/i915/vrr: Set vrr.vmin to min Vtotal
> 
> Previously, when vrr.guardband was matched to vblank length, vrr.vmin was set
> to crtc_vtotal for all cases to avoid having vrr.vmin changed when we switch
> from fixed refresh rate timings to variable refresh rate timings.
> 
> Now that we are using an optimized vrr.guardband, we can simply set the
> vrr.vmin to the lowest Vtotal (for highest refresh rate supported by the
> panel) .
> 
> For non-vrr panels, the vrr.vmin stays the same i.e. crtc_vtotal.
> 
> Signed-off-by: Ankit Nautiyal <ankit.k.nautiyal at intel.com>
> ---
>  drivers/gpu/drm/i915/display/intel_vrr.c | 37 ++++++++++++++++--------
>  1 file changed, 25 insertions(+), 12 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/display/intel_vrr.c
> b/drivers/gpu/drm/i915/display/intel_vrr.c
> index b73d99877ce3..780f91db3bc8 100644
> --- a/drivers/gpu/drm/i915/display/intel_vrr.c
> +++ b/drivers/gpu/drm/i915/display/intel_vrr.c
> @@ -280,6 +280,9 @@ int intel_vrr_fixed_rr_vmin(const struct intel_crtc_state
> *crtc_state)  {
>  	struct intel_display *display = to_intel_display(crtc_state);
> 
> +	if (crtc_state->vrr.in_range)
> +		return crtc_state->vrr.vmin;

This looses the purpose of this function which goes by its name, "fixed_rr_vmin".

How about adding a separate static function in intel_set_transcoder_timings_lrr ?

> +
>  	return intel_vrr_fixed_rr_vtotal(crtc_state) -
>  		intel_vrr_flipline_offset(display);
>  }
> @@ -310,26 +313,37 @@ static
>  void intel_vrr_compute_fixed_rr_timings(struct intel_crtc_state *crtc_state)  {
>  	/*
> -	 * For fixed rr,  vmin = vmax = flipline.
> -	 * vmin is already set to crtc_vtotal set vmax and flipline the same.
> +	 * For fixed rr vmax = flipline.
> +	 * set vmax and flipline same as vtotal.
>  	 */
>  	crtc_state->vrr.vmax = crtc_state->hw.adjusted_mode.crtc_vtotal;
>  	crtc_state->vrr.flipline = crtc_state->hw.adjusted_mode.crtc_vtotal;
>  }
> 
>  static
> -int intel_vrr_compute_vmin(struct intel_crtc_state *crtc_state)
> +int intel_vrr_compute_fixed_vmin(struct intel_crtc_state *crtc_state)
>  {
>  	/*
> -	 * To make fixed rr and vrr work seamless the guardband/pipeline full
> -	 * should be set such that it satisfies both the fixed and variable
> -	 * timings.
> -	 * For this set the vmin as crtc_vtotal. With this we never need to
> -	 * change anything to do with the guardband.
> +	 * For non VRR supporting panels/config, set the vmin to crtc_vtotal.
> +	 * This will help the case where VRR TG is used even for non-vrr
> panels/config.
>  	 */
>  	return crtc_state->hw.adjusted_mode.crtc_vtotal;
>  }
> 
> +static
> +int intel_vrr_compute_vmin(struct intel_connector *connector,
> +			   const struct drm_display_mode *adjusted_mode) {
> +	const struct drm_display_info *info = &connector->base.display_info;
> +	int vmin;
> +
> +	vmin = adjusted_mode->crtc_clock * 1000 /
> +		(adjusted_mode->crtc_htotal * info-
> >monitor_range.max_vfreq);
> +	vmin = min_t(int, vmin, adjusted_mode->crtc_vtotal);
> +
> +	return vmin;
> +}
> +
>  static
>  int intel_vrr_compute_vmax(struct intel_connector *connector,
>  			   const struct drm_display_mode *adjusted_mode)
> @@ -376,13 +390,13 @@ intel_vrr_compute_config(struct intel_crtc_state
> *crtc_state,
>  	if (crtc_state->joiner_pipes)
>  		crtc_state->vrr.in_range = false;
> 
> -	vmin = intel_vrr_compute_vmin(crtc_state);
> -
>  	if (crtc_state->vrr.in_range) {
>  		if (HAS_LRR(display))
>  			crtc_state->update_lrr = true;
>  		vmax = intel_vrr_compute_vmax(connector, adjusted_mode);
> +		vmin = intel_vrr_compute_vmin(connector, adjusted_mode);
>  	} else {
> +		vmin = intel_vrr_compute_fixed_vmin(crtc_state);
>  		vmax = vmin;
>  	}
> 
> @@ -769,8 +783,7 @@ void intel_vrr_transcoder_disable(const struct
> intel_crtc_state *crtc_state)  bool intel_vrr_is_fixed_rr(const struct
> intel_crtc_state *crtc_state)  {
>  	return crtc_state->vrr.flipline &&
> -	       crtc_state->vrr.flipline == crtc_state->vrr.vmax &&
> -	       crtc_state->vrr.flipline == intel_vrr_vmin_flipline(crtc_state);
> +	       crtc_state->vrr.flipline == crtc_state->vrr.vmax;
>  }
> 
>  void intel_vrr_get_config(struct intel_crtc_state *crtc_state)
> --
> 2.45.2