On Tue, Mar 18, 2025 at 01:05:33PM +0530, Ankit Nautiyal wrote: > 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@xxxxxxxxx> > --- > drivers/gpu/drm/i915/display/intel_vrr.c | 8 +++++++- > 1 file changed, 7 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_vrr.c b/drivers/gpu/drm/i915/display/intel_vrr.c > index 3f610e382883..66afa66c66af 100644 > --- a/drivers/gpu/drm/i915/display/intel_vrr.c > +++ b/drivers/gpu/drm/i915/display/intel_vrr.c > @@ -630,6 +630,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)); > @@ -673,7 +674,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; Ah, this fixes the intel_vrr_always_use_vrr_tg() case. Reviewed-by: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx> > > /* > * #TODO: For Both VRR and CMRR the flag I915_MODE_FLAG_VRR is set for mode_flags. > -- > 2.45.2 -- Ville Syrjälä Intel
