Commit 1d231cd8 authored by Jani Nikula's avatar Jani Nikula

drm/i915: pass dev_priv explicitly to TRANS_EXITLINE

Avoid the implicit dev_priv local variable use, and pass dev_priv
explicitly to the TRANS_EXITLINE register macro.
Reviewed-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/eb1e5fe155daf2d271af76e683a1f3f33e34403a.1714471597.git.jani.nikula@intel.comSigned-off-by: default avatarJani Nikula <jani.nikula@intel.com>
parent ca5d5ecb
...@@ -1685,7 +1685,8 @@ void intel_psr_get_config(struct intel_encoder *encoder, ...@@ -1685,7 +1685,8 @@ void intel_psr_get_config(struct intel_encoder *encoder,
} }
if (DISPLAY_VER(dev_priv) >= 12) { if (DISPLAY_VER(dev_priv) >= 12) {
val = intel_de_read(dev_priv, TRANS_EXITLINE(cpu_transcoder)); val = intel_de_read(dev_priv,
TRANS_EXITLINE(dev_priv, cpu_transcoder));
pipe_config->dc3co_exitline = REG_FIELD_GET(EXITLINE_MASK, val); pipe_config->dc3co_exitline = REG_FIELD_GET(EXITLINE_MASK, val);
} }
unlock: unlock:
...@@ -1877,7 +1878,9 @@ static void intel_psr_enable_source(struct intel_dp *intel_dp, ...@@ -1877,7 +1878,9 @@ static void intel_psr_enable_source(struct intel_dp *intel_dp,
* transcoder, EXITLINE will need to be unset when disabling PSR * transcoder, EXITLINE will need to be unset when disabling PSR
*/ */
if (intel_dp->psr.dc3co_exitline) if (intel_dp->psr.dc3co_exitline)
intel_de_rmw(dev_priv, TRANS_EXITLINE(cpu_transcoder), EXITLINE_MASK, intel_de_rmw(dev_priv,
TRANS_EXITLINE(dev_priv, cpu_transcoder),
EXITLINE_MASK,
intel_dp->psr.dc3co_exitline << EXITLINE_SHIFT | EXITLINE_ENABLE); intel_dp->psr.dc3co_exitline << EXITLINE_SHIFT | EXITLINE_ENABLE);
if (HAS_PSR_HW_TRACKING(dev_priv) && HAS_PSR2_SEL_FETCH(dev_priv)) if (HAS_PSR_HW_TRACKING(dev_priv) && HAS_PSR2_SEL_FETCH(dev_priv))
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
#include "intel_display_reg_defs.h" #include "intel_display_reg_defs.h"
#include "intel_dp_aux_regs.h" #include "intel_dp_aux_regs.h"
#define TRANS_EXITLINE(trans) _MMIO_TRANS2(dev_priv, (trans), _TRANS_EXITLINE_A) #define TRANS_EXITLINE(dev_priv, trans) _MMIO_TRANS2(dev_priv, (trans), _TRANS_EXITLINE_A)
#define EXITLINE_ENABLE REG_BIT(31) #define EXITLINE_ENABLE REG_BIT(31)
#define EXITLINE_MASK REG_GENMASK(12, 0) #define EXITLINE_MASK REG_GENMASK(12, 0)
#define EXITLINE_SHIFT 0 #define EXITLINE_SHIFT 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