drm/i915: pass dev_priv explicitly to PIPE_ARB_CTL

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

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

diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
index 9434eba91839ca0299f9cead98a64d64987a1ddc..48ee8aee21bee37d79637387f311efe0567a0635 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -439,7 +439,7 @@ void intel_enable_transcoder(const struct intel_crtc_state *new_crtc_state)
 
        /* Wa_22012358565:adl-p */
        if (DISPLAY_VER(dev_priv) == 13)
-               intel_de_rmw(dev_priv, PIPE_ARB_CTL(pipe),
+               intel_de_rmw(dev_priv, PIPE_ARB_CTL(dev_priv, pipe),
                             0, PIPE_ARB_USE_PROG_SLOTS);
 
        if (DISPLAY_VER(dev_priv) >= 14) {

diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
index a94b050f09bf56e541713307b8c277dc2e264722..0b699bcac759ba92d9b93d2b359bbdd5e0ebab2c 100644 (file)
--- a/drivers/gpu/drm/i915/i915_reg.h
+++ b/drivers/gpu/drm/i915/i915_reg.h
@@ -1802,7 +1802,7 @@
 #define PIPESTAT(dev_priv, pipe)               _MMIO_PIPE2(dev_priv, pipe, _PIPEASTAT)
 
 #define _PIPE_ARB_CTL_A                        0x70028 /* icl+ */
-#define PIPE_ARB_CTL(pipe)             _MMIO_PIPE2(dev_priv, pipe, _PIPE_ARB_CTL_A)
+#define PIPE_ARB_CTL(dev_priv, pipe)           _MMIO_PIPE2(dev_priv, pipe, _PIPE_ARB_CTL_A)
 #define   PIPE_ARB_USE_PROG_SLOTS      REG_BIT(13)
 
 #define _PIPE_MISC_A                   0x70030