drm/i915/vrr: Always write TRANS_VRR_CTL in intel_vrr_set_transcoder_timings() on...

Currently, depending on vrr.enable, we may write TRANS_VRR_CTL from
both intel_vrr_set_transcoder_timings() and intel_vrr_transcoder_enable()
on !always_use_vrr_tg() platforms. Streamline this so that we just
always write it from intel_vrr_set_transcoder_timings(), and
never from intel_vrr_transcoder_enable().

The main benefit is that intel_vrr_transcoder_enable() becomes symmetric
to intel_vrr_transcoder_disable().

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20251020185038.4272-16-ville.syrjala@linux.intel.com
Reviewed-by: Ankit Nautiyal <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 d8fbbef1ae236a0e05dd904994a905c2251294c2..67b1ed606d8fb2530230f3b56f580e16d30837a4 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_vrr.c
+++ b/drivers/gpu/drm/i915/display/intel_vrr.c
@@ -562,7 +562,7 @@ void intel_vrr_set_transcoder_timings(const struct intel_crtc_state *crtc_state)
 
        intel_vrr_set_fixed_rr_timings(crtc_state);
 
-       if (!intel_vrr_always_use_vrr_tg(display) && !crtc_state->vrr.enable)
+       if (!intel_vrr_always_use_vrr_tg(display))
                intel_de_write(display, TRANS_VRR_CTL(display, cpu_transcoder),
                               trans_vrr_ctl(crtc_state));
 
@@ -759,7 +759,6 @@ void intel_vrr_disable(const struct intel_crtc_state *old_crtc_state)
 void intel_vrr_transcoder_enable(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 (!HAS_VRR(display))
                return;
@@ -767,13 +766,8 @@ void intel_vrr_transcoder_enable(const struct intel_crtc_state *crtc_state)
        if (!intel_vrr_possible(crtc_state))
                return;
 
-       if (!intel_vrr_always_use_vrr_tg(display)) {
-               intel_de_write(display, TRANS_VRR_CTL(display, cpu_transcoder),
-                              trans_vrr_ctl(crtc_state));
-               return;
-       }
-
-       intel_vrr_tg_enable(crtc_state, false);
+       if (intel_vrr_always_use_vrr_tg(display))
+               intel_vrr_tg_enable(crtc_state, false);
 }
 
 void intel_vrr_transcoder_disable(const struct intel_crtc_state *crtc_state)