intel-gfx.lists.freedesktop.org archive mirror
 help / color / mirror / Atom feed
From: "Ville Syrjälä" <ville.syrjala@linux.intel.com>
To: Ankit Nautiyal <ankit.k.nautiyal@intel.com>
Cc: intel-gfx@lists.freedesktop.org, intel-xe@lists.freedesktop.org,
	jani.nikula@linux.intel.com,
	mitulkumar.ajitkumar.golani@intel.com
Subject: Re: [PATCH 07/20] drm/i915/vrr: Prepare for fixed refresh rate timings
Date: Wed, 26 Feb 2025 15:13:19 +0200	[thread overview]
Message-ID: <Z78Tb0VoSiMiDXRY@intel.com> (raw)
In-Reply-To: <20250224061717.1095226-8-ankit.k.nautiyal@intel.com>

On Mon, Feb 24, 2025 at 11:47:04AM +0530, Ankit Nautiyal wrote:
> Currently we always compute the timings as if vrr is enabled.
> With this approach the state checker becomes complicated when we
> introduce fixed refresh rate mode with vrr timing generator.
> 
> To avoid the complications, instead of always computing vrr timings, we
> compute vrr timings based on uapi.vrr_enable knob.
> So when the knob is disabled we always compute vmin=flipline=vmax.
> 
> v2: Use actual timings without any adjustments while preparing for
> fixed timings in compute_config. (Ville)
> 
> Signed-off-by: Ankit Nautiyal <ankit.k.nautiyal@intel.com>

Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>

> ---
>  drivers/gpu/drm/i915/display/intel_vrr.c | 70 ++++++++++++++++++++++++
>  1 file changed, 70 insertions(+)
> 
> diff --git a/drivers/gpu/drm/i915/display/intel_vrr.c b/drivers/gpu/drm/i915/display/intel_vrr.c
> index b6120ff1a87c..45efcb57c77a 100644
> --- a/drivers/gpu/drm/i915/display/intel_vrr.c
> +++ b/drivers/gpu/drm/i915/display/intel_vrr.c
> @@ -246,6 +246,65 @@ void intel_vrr_compute_vrr_timings(struct intel_crtc_state *crtc_state)
>  	crtc_state->mode_flags |= I915_MODE_FLAG_VRR;
>  }
>  
> +/*
> + * For fixed refresh rate mode Vmin, Vmax and Flipline all are set to
> + * Vtotal value.
> + */
> +static
> +int intel_vrr_fixed_rr_vtotal(const struct intel_crtc_state *crtc_state)
> +{
> +	struct intel_display *display = to_intel_display(crtc_state);
> +	int crtc_vtotal = crtc_state->hw.adjusted_mode.crtc_vtotal;
> +
> +	if (DISPLAY_VER(display) >= 13)
> +		return crtc_vtotal;
> +	else
> +		return crtc_vtotal -
> +			intel_vrr_real_vblank_delay(crtc_state);
> +}
> +
> +static
> +int intel_vrr_fixed_rr_vmax(const struct intel_crtc_state *crtc_state)
> +{
> +	return intel_vrr_fixed_rr_vtotal(crtc_state);
> +}
> +
> +static
> +int intel_vrr_fixed_rr_vmin(const struct intel_crtc_state *crtc_state)
> +{
> +	struct intel_display *display = to_intel_display(crtc_state);
> +
> +	return intel_vrr_fixed_rr_vtotal(crtc_state) -
> +		intel_vrr_flipline_offset(display);
> +}
> +
> +static
> +int intel_vrr_fixed_rr_flipline(const struct intel_crtc_state *crtc_state)
> +{
> +	return intel_vrr_fixed_rr_vtotal(crtc_state);
> +}
> +
> +static
> +void intel_vrr_set_fixed_rr_timings(const struct intel_crtc_state *crtc_state)
> +{
> +	struct intel_display *display = to_intel_display(crtc_state);
> +	enum transcoder cpu_transcoder = crtc_state->cpu_transcoder;
> +
> +	intel_de_write(display, TRANS_VRR_VMIN(display, cpu_transcoder),
> +		       intel_vrr_fixed_rr_vmin(crtc_state) - 1);
> +	intel_de_write(display, TRANS_VRR_VMAX(display, cpu_transcoder),
> +		       intel_vrr_fixed_rr_vmax(crtc_state) - 1);
> +	intel_de_write(display, TRANS_VRR_FLIPLINE(display, cpu_transcoder),
> +		       intel_vrr_fixed_rr_flipline(crtc_state) - 1);
> +}
> +
> +static
> +void intel_vrr_prepare_fixed_timings(struct intel_crtc_state *crtc_state)
> +{
> +	crtc_state->vrr.vmax = intel_vrr_vmin_flipline(crtc_state);
> +	crtc_state->vrr.flipline = intel_vrr_vmin_flipline(crtc_state);
> +}
> +
>  static
>  int intel_vrr_compute_vmin(struct intel_crtc_state *crtc_state)
>  {
> @@ -326,6 +385,8 @@ intel_vrr_compute_config(struct intel_crtc_state *crtc_state,
>  		intel_vrr_compute_vrr_timings(crtc_state);
>  	else if (is_cmrr_frac_required(crtc_state) && is_edp)
>  		intel_vrr_compute_cmrr_timings(crtc_state);
> +	else
> +		intel_vrr_prepare_fixed_timings(crtc_state);
>  
>  	if (HAS_AS_SDP(display)) {
>  		crtc_state->vrr.vsync_start =
> @@ -497,6 +558,13 @@ void intel_vrr_enable(const struct intel_crtc_state *crtc_state)
>  	if (!crtc_state->vrr.enable)
>  		return;
>  
> +	intel_de_write(display, TRANS_VRR_VMIN(display, cpu_transcoder),
> +		       crtc_state->vrr.vmin - 1);
> +	intel_de_write(display, TRANS_VRR_VMAX(display, cpu_transcoder),
> +		       crtc_state->vrr.vmax - 1);
> +	intel_de_write(display, TRANS_VRR_FLIPLINE(display, cpu_transcoder),
> +		       crtc_state->vrr.flipline - 1);
> +
>  	intel_de_write(display, TRANS_PUSH(display, cpu_transcoder),
>  		       TRANS_PUSH_EN);
>  
> @@ -524,6 +592,8 @@ void intel_vrr_disable(const struct intel_crtc_state *old_crtc_state)
>  				TRANS_VRR_STATUS(display, cpu_transcoder),
>  				VRR_STATUS_VRR_EN_LIVE, 1000);
>  	intel_de_write(display, TRANS_PUSH(display, cpu_transcoder), 0);
> +
> +	intel_vrr_set_fixed_rr_timings(old_crtc_state);
>  }
>  
>  static
> -- 
> 2.45.2

-- 
Ville Syrjälä
Intel

  reply	other threads:[~2025-02-26 13:13 UTC|newest]

Thread overview: 57+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-02-24  6:16 [PATCH 00/20] Use VRR timing generator for fixed refresh rate modes Ankit Nautiyal
2025-02-24  6:16 ` [PATCH 01/20] drm/i915/vrr: Remove unwanted comment Ankit Nautiyal
2025-02-26 13:06   ` Ville Syrjälä
2025-02-24  6:16 ` [PATCH 02/20] drm/i915:vrr: Separate out functions to compute vmin and vmax Ankit Nautiyal
2025-02-26 12:59   ` Ville Syrjälä
2025-02-27 10:13     ` Nautiyal, Ankit K
2025-02-24  6:17 ` [PATCH 03/20] drm/i915/vrr: Make helpers for cmrr and vrr timings Ankit Nautiyal
2025-02-26 13:07   ` Ville Syrjälä
2025-02-24  6:17 ` [PATCH 04/20] drm/i915/vrr: Disable CMRR Ankit Nautiyal
2025-02-26 13:08   ` Ville Syrjälä
2025-02-24  6:17 ` [PATCH 05/20] drm/i915/vrr: Track vrr.enable only for variable timing Ankit Nautiyal
2025-02-26 13:10   ` Ville Syrjälä
2025-02-27 10:16     ` Nautiyal, Ankit K
2025-02-24  6:17 ` [PATCH 06/20] drm/i915/vrr: Use crtc_vtotal for vmin Ankit Nautiyal
2025-02-26 13:11   ` Ville Syrjälä
2025-02-24  6:17 ` [PATCH 07/20] drm/i915/vrr: Prepare for fixed refresh rate timings Ankit Nautiyal
2025-02-26 13:13   ` Ville Syrjälä [this message]
2025-02-24  6:17 ` [PATCH 08/20] drm/i915/display: Enable MSA Ignore Timing PAR only when in not fixed_rr mode Ankit Nautiyal
2025-02-26 13:27   ` Ville Syrjälä
2025-02-27 10:19     ` Nautiyal, Ankit K
2025-02-24  6:17 ` [PATCH 09/20] drm/i915/hdmi: Use VRR Timing generator for HDMI Ankit Nautiyal
2025-02-26 13:30   ` Ville Syrjälä
2025-02-27 10:31     ` Nautiyal, Ankit K
2025-02-24  6:17 ` [PATCH 10/20] drm/i915/dp_mst: Use VRR Timing generator for DP MST Ankit Nautiyal
2025-02-26 13:30   ` Ville Syrjälä
2025-02-24  6:17 ` [PATCH 11/20] drm/i915/display: Disable PSR before disabling VRR Ankit Nautiyal
2025-02-26 13:45   ` Ville Syrjälä
2025-02-27 10:33     ` Nautiyal, Ankit K
2025-02-24  6:17 ` [PATCH 12/20] drm/i915/display: Extend WA 14015406119 for PSR2 Ankit Nautiyal
2025-02-26 13:55   ` Ville Syrjälä
2025-02-27 10:36     ` Nautiyal, Ankit K
2025-02-24  6:17 ` [PATCH 13/20] drm/i915/vrr: Handle joiner with vrr Ankit Nautiyal
2025-02-24 13:47   ` Nautiyal, Ankit K
2025-02-26 15:14     ` Ville Syrjälä
2025-02-27 10:37       ` Nautiyal, Ankit K
2025-02-24  6:17 ` [PATCH 14/20] drm/i915/vrr: Refactor condition for computing vmax and LRR Ankit Nautiyal
2025-02-26 14:01   ` Ville Syrjälä
2025-02-27 10:39     ` Nautiyal, Ankit K
2025-02-24  6:17 ` [PATCH 15/20] drm/i915/vrr: Always set vrr vmax/vmin/flipline in vrr_{enable/disable} Ankit Nautiyal
2025-02-26 14:01   ` Ville Syrjälä
2025-02-24  6:17 ` [PATCH 16/20] drm/i915/display: Use fixed rr timings in intel_set_transcoder_timings_lrr() Ankit Nautiyal
2025-02-26 15:00   ` Ville Syrjälä
2025-02-27 10:28     ` Nautiyal, Ankit K
2025-02-24  6:17 ` [PATCH 17/20] drm/i915/display: Use fixed_rr timings in modeset sequence Ankit Nautiyal
2025-02-26 15:06   ` Ville Syrjälä
2025-02-26 16:04     ` Ville Syrjälä
2025-02-27 10:44       ` Nautiyal, Ankit K
2025-02-27 10:42     ` Nautiyal, Ankit K
2025-02-24  6:17 ` [PATCH 18/20] drm/i915/vrr: Use fixed timings for platforms that support VRR Ankit Nautiyal
2025-02-26 15:11   ` Ville Syrjälä
2025-02-27 11:01     ` Nautiyal, Ankit K
2025-02-27 21:05       ` Ville Syrjälä
2025-02-28 12:31         ` Nautiyal, Ankit K
2025-02-24  6:17 ` [PATCH 19/20] drm/i915/vrr: Always use VRR timing generator for MTL+ Ankit Nautiyal
2025-02-24  6:17 ` [PATCH 20/20] drm/i915/display: Add fixed_rr to crtc_state dump Ankit Nautiyal
2025-02-24 18:16 ` ✗ Fi.CI.SPARSE: warning for Use VRR timing generator for fixed refresh rate modes (rev10) Patchwork
2025-02-24 18:39 ` ✗ i915.CI.BAT: failure " Patchwork

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=Z78Tb0VoSiMiDXRY@intel.com \
    --to=ville.syrjala@linux.intel.com \
    --cc=ankit.k.nautiyal@intel.com \
    --cc=intel-gfx@lists.freedesktop.org \
    --cc=intel-xe@lists.freedesktop.org \
    --cc=jani.nikula@linux.intel.com \
    --cc=mitulkumar.ajitkumar.golani@intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).