drm/i915: pass dev_priv explicitly to TRANS_VRR_STATUS

Avoid the implicit dev_priv local variable use, and pass dev_priv
explicitly to the TRANS_VRR_STATUS register macro.

Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/57285c891b10d4827423c20563f2b4a2632e65c1.1715183162.git.jani.nikula@intel.com
Signed-off-by: Jani Nikula <jani.nikula@intel.com>

diff --git a/drivers/gpu/drm/i915/display/intel_vrr.c b/drivers/gpu/drm/i915/display/intel_vrr.c
index fd0f0794f6dc4ec2af9c412169c284fa2e51a68e..05cbd6e4fc60eee98c314c66d895a07de3ab639d 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_vrr.c
+++ b/drivers/gpu/drm/i915/display/intel_vrr.c
@@ -282,7 +282,8 @@ void intel_vrr_disable(const struct intel_crtc_state *old_crtc_state)
 
        intel_de_write(dev_priv, TRANS_VRR_CTL(dev_priv, cpu_transcoder),
                       trans_vrr_ctl(old_crtc_state));
-       intel_de_wait_for_clear(dev_priv, TRANS_VRR_STATUS(cpu_transcoder),
+       intel_de_wait_for_clear(dev_priv,
+                               TRANS_VRR_STATUS(dev_priv, cpu_transcoder),
                                VRR_STATUS_VRR_EN_LIVE, 1000);
        intel_de_write(dev_priv, TRANS_PUSH(cpu_transcoder), 0);
 

diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
index 3b22b9fc0bf5f273b2ba147ab5eb7b501b2f3e47..eddd355ca814afd43332088ac0f5655be39f0569 100644 (file)
--- a/drivers/gpu/drm/i915/i915_reg.h
+++ b/drivers/gpu/drm/i915/i915_reg.h
@@ -1271,7 +1271,7 @@
 #define _TRANS_VRR_STATUS_B            0x6142C
 #define _TRANS_VRR_STATUS_C            0x6242C
 #define _TRANS_VRR_STATUS_D            0x6342C
-#define TRANS_VRR_STATUS(trans)                _MMIO_TRANS2(dev_priv, trans, _TRANS_VRR_STATUS_A)
+#define TRANS_VRR_STATUS(dev_priv, trans)              _MMIO_TRANS2(dev_priv, trans, _TRANS_VRR_STATUS_A)
 #define   VRR_STATUS_VMAX_REACHED      REG_BIT(31)
 #define   VRR_STATUS_NOFLIP_TILL_BNDR  REG_BIT(30)
 #define   VRR_STATUS_FLIP_BEF_BNDR     REG_BIT(29)