drm/i915/vrr: Set vrr.enable for VRR TG with fixed_rr

For platforms that enable VRR TG only for variable timings, the
VRR_CTL.VRR_ENABLE bit indicates VRR is active. For platforms that
always have VRR TG enabled, the VRR_CTL.VRR_ENABLE bit indicates VRR
is active only when not in fixed refresh rate mode.

Signed-off-by: Ankit Nautiyal <ankit.k.nautiyal@intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://lore.kernel.org/r/20250324133248.4071909-8-ankit.k.nautiyal@intel.com

diff --git a/drivers/gpu/drm/i915/display/intel_vrr.c b/drivers/gpu/drm/i915/display/intel_vrr.c
index 8ae279f132fdeb204dd5f0406c585ec735d68ef2..8a0d27666ea721208c7fe04b2527cff780a48525 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_vrr.c
+++ b/drivers/gpu/drm/i915/display/intel_vrr.c
@@ -632,6 +632,7 @@ void intel_vrr_get_config(struct intel_crtc_state *crtc_state)
        struct intel_display *display = to_intel_display(crtc_state);
        enum transcoder cpu_transcoder = crtc_state->cpu_transcoder;
        u32 trans_vrr_ctl, trans_vrr_vsync;
+       bool vrr_enable;
 
        trans_vrr_ctl = intel_de_read(display,
                                      TRANS_VRR_CTL(display, cpu_transcoder));
@@ -675,7 +676,12 @@ void intel_vrr_get_config(struct intel_crtc_state *crtc_state)
                }
        }
 
-       crtc_state->vrr.enable = trans_vrr_ctl & VRR_CTL_VRR_ENABLE;
+       vrr_enable = trans_vrr_ctl & VRR_CTL_VRR_ENABLE;
+
+       if (intel_vrr_always_use_vrr_tg(display))
+               crtc_state->vrr.enable = vrr_enable && !intel_vrr_is_fixed_rr(crtc_state);
+       else
+               crtc_state->vrr.enable = vrr_enable;
 
        /*
         * #TODO: For Both VRR and CMRR the flag I915_MODE_FLAG_VRR is set for mode_flags.