drm/i915: pass dev_priv explicitly to TRANS_PUSH

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

Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/5b2a4eea42cf76830a829d8a543d877cad0fc52d.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 e7709b06b92c4167e31a2f0bbbcb42bc94229da9..5031b7ac80079e07b56f1b2c32151800ce281947 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_vrr.c
+++ b/drivers/gpu/drm/i915/display/intel_vrr.c
@@ -237,7 +237,7 @@ void intel_vrr_send_push(const struct intel_crtc_state *crtc_state)
        if (!crtc_state->vrr.enable)
                return;
 
-       intel_de_write(dev_priv, TRANS_PUSH(cpu_transcoder),
+       intel_de_write(dev_priv, TRANS_PUSH(dev_priv, cpu_transcoder),
                       TRANS_PUSH_EN | TRANS_PUSH_SEND);
 }
 
@@ -250,7 +250,7 @@ bool intel_vrr_is_push_sent(const struct intel_crtc_state *crtc_state)
        if (!crtc_state->vrr.enable)
                return false;
 
-       return intel_de_read(dev_priv, TRANS_PUSH(cpu_transcoder)) & TRANS_PUSH_SEND;
+       return intel_de_read(dev_priv, TRANS_PUSH(dev_priv, cpu_transcoder)) & TRANS_PUSH_SEND;
 }
 
 void intel_vrr_enable(const struct intel_crtc_state *crtc_state)
@@ -261,7 +261,8 @@ void intel_vrr_enable(const struct intel_crtc_state *crtc_state)
        if (!crtc_state->vrr.enable)
                return;
 
-       intel_de_write(dev_priv, TRANS_PUSH(cpu_transcoder), TRANS_PUSH_EN);
+       intel_de_write(dev_priv, TRANS_PUSH(dev_priv, cpu_transcoder),
+                      TRANS_PUSH_EN);
 
        if (HAS_AS_SDP(dev_priv))
                intel_de_write(dev_priv, TRANS_VRR_VSYNC(cpu_transcoder),
@@ -286,7 +287,7 @@ void intel_vrr_disable(const struct intel_crtc_state *old_crtc_state)
        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);
+       intel_de_write(dev_priv, TRANS_PUSH(dev_priv, cpu_transcoder), 0);
 
        if (HAS_AS_SDP(dev_priv))
                intel_de_write(dev_priv, TRANS_VRR_VSYNC(cpu_transcoder), 0);

diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
index feb466288b9e3fb14b6c043ef50e75c14b60cec9..70c4110b76dde115004e6fe7bc57fa4c8a548ac0 100644 (file)
--- a/drivers/gpu/drm/i915/i915_reg.h
+++ b/drivers/gpu/drm/i915/i915_reg.h
@@ -1317,7 +1317,7 @@
 #define _TRANS_PUSH_B                  0x61A70
 #define _TRANS_PUSH_C                  0x62A70
 #define _TRANS_PUSH_D                  0x63A70
-#define TRANS_PUSH(trans)              _MMIO_TRANS2(dev_priv, trans, _TRANS_PUSH_A)
+#define TRANS_PUSH(dev_priv, trans)            _MMIO_TRANS2(dev_priv, trans, _TRANS_PUSH_A)
 #define   TRANS_PUSH_EN                        REG_BIT(31)
 #define   TRANS_PUSH_SEND              REG_BIT(30)