]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
drm/i915/vrr: Use trans_vrr_ctl() in intel_vrr_transcoder_disable()
authorVille Syrjälä <ville.syrjala@linux.intel.com>
Mon, 20 Oct 2025 18:50:27 +0000 (21:50 +0300)
committerVille Syrjälä <ville.syrjala@linux.intel.com>
Fri, 24 Oct 2025 21:10:58 +0000 (00:10 +0300)
Currently intel_vrr_disable() writes TRANS_VRR_CTL() with
trans_vrr_ctl(), whereas intel_vrr_transcoder_disable() always
writes just a plain 0. Write trans_vrr_ctl() in both places to
unify the code, allowing for more shared code in the future.

Since the VRR timing generator will be disabled by the
TRANS_VRR_CTL write it doesn't really matter what we write to
the register (other than VRR_CTL_VRR_ENABLE that is).

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20251020185038.4272-12-ville.syrjala@linux.intel.com
Reviewed-by: Ankit Nautiyal <ankit.k.nautiyal@intel.com>
drivers/gpu/drm/i915/display/intel_vrr.c

index 562a5feadaab90422df295b829567a3d30fd5943..19b38ad771896d3809d2423dd6616f24d9890c3c 100644 (file)
@@ -779,7 +779,8 @@ void intel_vrr_transcoder_disable(const struct intel_crtc_state *crtc_state)
        if (!intel_vrr_possible(crtc_state))
                return;
 
-       intel_de_write(display, TRANS_VRR_CTL(display, cpu_transcoder), 0);
+       intel_de_write(display, TRANS_VRR_CTL(display, cpu_transcoder),
+                      trans_vrr_ctl(crtc_state));
 
        intel_vrr_wait_for_live_status_clear(display, cpu_transcoder);