From: Ankit Nautiyal <ankit.k.nautiyal@intel.com>
To: intel-gfx@lists.freedesktop.org
Cc: intel-xe@lists.freedesktop.org, jani.nikula@linux.intel.com,
ville.syrjala@linux.intel.com,
mitulkumar.ajitkumar.golani@intel.com
Subject: [PATCH 07/21] drm/i915/vrr: Prepare for fixed refresh rate timings
Date: Thu, 6 Mar 2025 18:40:46 +0530 [thread overview]
Message-ID: <20250306131100.3989503-8-ankit.k.nautiyal@intel.com> (raw)
In-Reply-To: <20250306131100.3989503-1-ankit.k.nautiyal@intel.com>
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)
v3: Avoid setting fixed timings if !vrr_possible().
v4: Move vmin adjustement after all other timings are complete. (Ville)
Signed-off-by: Ankit Nautiyal <ankit.k.nautiyal@intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com> (#v2)
---
drivers/gpu/drm/i915/display/intel_vrr.c | 87 ++++++++++++++++++++++--
1 file changed, 82 insertions(+), 5 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_vrr.c b/drivers/gpu/drm/i915/display/intel_vrr.c
index e0573e28014b..622a70e21737 100644
--- a/drivers/gpu/drm/i915/display/intel_vrr.c
+++ b/drivers/gpu/drm/i915/display/intel_vrr.c
@@ -246,6 +246,72 @@ 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;
+
+ if (!intel_vrr_possible(crtc_state))
+ return;
+
+ 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_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.
+ */
+ 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)
{
@@ -314,6 +380,13 @@ intel_vrr_compute_config(struct intel_crtc_state *crtc_state,
crtc_state->vrr.flipline = crtc_state->vrr.vmin;
+ if (crtc_state->uapi.vrr_enabled)
+ 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_compute_fixed_rr_timings(crtc_state);
+
/*
* flipline determines the min vblank length the hardware will
* generate, and on ICL/TGL flipline>=vmin+1, hence we reduce
@@ -321,11 +394,6 @@ intel_vrr_compute_config(struct intel_crtc_state *crtc_state,
*/
crtc_state->vrr.vmin -= intel_vrr_flipline_offset(display);
- if (crtc_state->uapi.vrr_enabled)
- intel_vrr_compute_vrr_timings(crtc_state);
- else if (is_cmrr_frac_required(crtc_state) && is_edp)
- intel_vrr_compute_cmrr_timings(crtc_state);
-
if (HAS_AS_SDP(display)) {
crtc_state->vrr.vsync_start =
(crtc_state->hw.adjusted_mode.crtc_vtotal -
@@ -496,6 +564,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);
@@ -523,6 +598,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
next prev parent reply other threads:[~2025-03-06 13:23 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-03-06 13:10 [PATCH 00/21] Use VRR timing generator for fixed refresh rate modes Ankit Nautiyal
2025-03-06 13:10 ` [PATCH 01/21] drm/i915/vrr: Remove unwanted comment Ankit Nautiyal
2025-03-06 13:10 ` [PATCH 02/21] drm/i915:vrr: Separate out functions to compute vmin and vmax Ankit Nautiyal
2025-03-06 13:10 ` [PATCH 03/21] drm/i915/vrr: Make helpers for cmrr and vrr timings Ankit Nautiyal
2025-03-06 13:10 ` [PATCH 04/21] drm/i915/vrr: Disable CMRR Ankit Nautiyal
2025-03-06 13:10 ` [PATCH 05/21] drm/i915/vrr: Track vrr.enable only for variable timing Ankit Nautiyal
2025-03-06 13:10 ` [PATCH 06/21] drm/i915/vrr: Use crtc_vtotal for vmin Ankit Nautiyal
2025-03-06 13:10 ` Ankit Nautiyal [this message]
2025-03-06 13:10 ` [PATCH 08/21] drm/i915/display: Enable MSA Ignore Timing PAR only when in not fixed_rr mode Ankit Nautiyal
2025-03-06 13:10 ` [PATCH 09/21] drm/i915/hdmi: Use VRR Timing generator for HDMI for fixed_rr Ankit Nautiyal
2025-03-06 13:10 ` [PATCH 10/21] drm/i915/dp_mst: Use VRR Timing generator for DP MST " Ankit Nautiyal
2025-03-06 13:10 ` [PATCH 11/21] drm/i915/display: Disable PSR before disabling VRR Ankit Nautiyal
2025-03-06 13:10 ` [PATCH 12/21] drm/i915/display: Move intel_psr_post_plane_update() at the later Ankit Nautiyal
2025-03-06 13:10 ` [PATCH 13/21] drm/i915/vrr: Refactor condition for computing vmax and LRR Ankit Nautiyal
2025-03-06 16:40 ` Ville Syrjälä
2025-03-06 13:10 ` [PATCH 14/21] drm/i915/vrr: Always set vrr vmax/vmin/flipline in vrr_{enable/disable} Ankit Nautiyal
2025-03-06 13:10 ` [PATCH 15/21] drm/i915/display: Use fixed_rr timings in modeset sequence Ankit Nautiyal
2025-03-06 16:46 ` Ville Syrjälä
2025-03-07 12:03 ` Nautiyal, Ankit K
2025-03-07 12:50 ` Ville Syrjälä
2025-03-09 14:55 ` Nautiyal, Ankit K
2025-03-06 13:10 ` [PATCH 16/21] drm/i915/vrr: Use fixed timings for platforms that support VRR Ankit Nautiyal
2025-03-06 16:47 ` Ville Syrjälä
2025-03-06 13:10 ` [PATCH 17/21] drm/i915/display: Move vrr.guardband/pipeline_full out of !fastset block Ankit Nautiyal
2025-03-07 14:26 ` Ville Syrjälä
2025-03-09 16:35 ` Nautiyal, Ankit K
2025-03-10 15:52 ` Ville Syrjälä
2025-03-06 13:10 ` [PATCH 18/21] drm/i915/display: Use fixed rr timings in intel_set_transcoder_timings_lrr() Ankit Nautiyal
2025-03-06 13:10 ` [PATCH 19/21] drm/i915/vrr: Allow fixed_rr with pipe joiner Ankit Nautiyal
2025-03-06 13:10 ` [PATCH 20/21] drm/i915/vrr: Always use VRR timing generator for MTL+ Ankit Nautiyal
2025-03-06 13:11 ` [PATCH 21/21] drm/i915/display: Add fixed_rr to crtc_state dump Ankit Nautiyal
2025-03-06 14:29 ` ✓ CI.Patch_applied: success for Use VRR timing generator for fixed refresh rate modes (rev7) Patchwork
2025-03-06 14:30 ` ✓ CI.checkpatch: " Patchwork
2025-03-06 14:31 ` ✓ CI.KUnit: " Patchwork
2025-03-06 14:51 ` ✓ CI.Build: " Patchwork
2025-03-06 14:51 ` ✓ CI.Hooks: " Patchwork
2025-03-06 14:52 ` ✗ CI.checksparse: warning " Patchwork
2025-03-06 15:14 ` ✓ Xe.CI.BAT: success " Patchwork
2025-03-07 0:19 ` ✓ Xe.CI.Full: " Patchwork
-- strict thread matches above, loose matches on Subject: below --
2025-03-10 12:15 [PATCH 00/21] Use VRR timing generator for fixed refresh rate modes Ankit Nautiyal
2025-03-10 12:16 ` [PATCH 07/21] drm/i915/vrr: Prepare for fixed refresh rate timings Ankit Nautiyal
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=20250306131100.3989503-8-ankit.k.nautiyal@intel.com \
--to=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 \
--cc=ville.syrjala@linux.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