Commit deac7611 authored by Jani Nikula's avatar Jani Nikula

drm/i915: pass dev_priv explicitly to TRANS_VRR_VSYNC

Avoid the implicit dev_priv local variable use, and pass dev_priv
explicitly to the TRANS_VRR_VSYNC register macro.
Reviewed-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/61b464bedfd75a97ca214e066be5417d790ccb26.1715183162.git.jani.nikula@intel.comSigned-off-by: default avatarJani Nikula <jani.nikula@intel.com>
parent 0f5b235f
...@@ -265,7 +265,8 @@ void intel_vrr_enable(const struct intel_crtc_state *crtc_state) ...@@ -265,7 +265,8 @@ void intel_vrr_enable(const struct intel_crtc_state *crtc_state)
TRANS_PUSH_EN); TRANS_PUSH_EN);
if (HAS_AS_SDP(dev_priv)) if (HAS_AS_SDP(dev_priv))
intel_de_write(dev_priv, TRANS_VRR_VSYNC(cpu_transcoder), intel_de_write(dev_priv,
TRANS_VRR_VSYNC(dev_priv, cpu_transcoder),
VRR_VSYNC_END(crtc_state->vrr.vsync_end) | VRR_VSYNC_END(crtc_state->vrr.vsync_end) |
VRR_VSYNC_START(crtc_state->vrr.vsync_start)); VRR_VSYNC_START(crtc_state->vrr.vsync_start));
...@@ -290,7 +291,8 @@ void intel_vrr_disable(const struct intel_crtc_state *old_crtc_state) ...@@ -290,7 +291,8 @@ void intel_vrr_disable(const struct intel_crtc_state *old_crtc_state)
intel_de_write(dev_priv, TRANS_PUSH(dev_priv, cpu_transcoder), 0); intel_de_write(dev_priv, TRANS_PUSH(dev_priv, cpu_transcoder), 0);
if (HAS_AS_SDP(dev_priv)) if (HAS_AS_SDP(dev_priv))
intel_de_write(dev_priv, TRANS_VRR_VSYNC(cpu_transcoder), 0); intel_de_write(dev_priv,
TRANS_VRR_VSYNC(dev_priv, cpu_transcoder), 0);
} }
void intel_vrr_get_config(struct intel_crtc_state *crtc_state) void intel_vrr_get_config(struct intel_crtc_state *crtc_state)
...@@ -326,7 +328,8 @@ void intel_vrr_get_config(struct intel_crtc_state *crtc_state) ...@@ -326,7 +328,8 @@ void intel_vrr_get_config(struct intel_crtc_state *crtc_state)
if (HAS_AS_SDP(dev_priv)) { if (HAS_AS_SDP(dev_priv)) {
trans_vrr_vsync = trans_vrr_vsync =
intel_de_read(dev_priv, TRANS_VRR_VSYNC(cpu_transcoder)); intel_de_read(dev_priv,
TRANS_VRR_VSYNC(dev_priv, cpu_transcoder));
crtc_state->vrr.vsync_start = crtc_state->vrr.vsync_start =
REG_FIELD_GET(VRR_VSYNC_START_MASK, trans_vrr_vsync); REG_FIELD_GET(VRR_VSYNC_START_MASK, trans_vrr_vsync);
crtc_state->vrr.vsync_end = crtc_state->vrr.vsync_end =
......
...@@ -1322,7 +1322,7 @@ ...@@ -1322,7 +1322,7 @@
#define TRANS_PUSH_SEND REG_BIT(30) #define TRANS_PUSH_SEND REG_BIT(30)
#define _TRANS_VRR_VSYNC_A 0x60078 #define _TRANS_VRR_VSYNC_A 0x60078
#define TRANS_VRR_VSYNC(trans) _MMIO_TRANS2(dev_priv, trans, _TRANS_VRR_VSYNC_A) #define TRANS_VRR_VSYNC(dev_priv, trans) _MMIO_TRANS2(dev_priv, trans, _TRANS_VRR_VSYNC_A)
#define VRR_VSYNC_END_MASK REG_GENMASK(28, 16) #define VRR_VSYNC_END_MASK REG_GENMASK(28, 16)
#define VRR_VSYNC_END(vsync_end) REG_FIELD_PREP(VRR_VSYNC_END_MASK, (vsync_end)) #define VRR_VSYNC_END(vsync_end) REG_FIELD_PREP(VRR_VSYNC_END_MASK, (vsync_end))
#define VRR_VSYNC_START_MASK REG_GENMASK(12, 0) #define VRR_VSYNC_START_MASK REG_GENMASK(12, 0)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment