[PATCH 01/16] drm/i915: pass dev_priv explicitly to DSPADDR_VLV

[Jani Nikula]

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

Signed-off-by: Jani Nikula <jani.nik...@intel.com>
---
 drivers/gpu/drm/i915/display/i9xx_plane.c      | 2 +-
 drivers/gpu/drm/i915/display/i9xx_plane_regs.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/i9xx_plane.c 
b/drivers/gpu/drm/i915/display/i9xx_plane.c
index 1f05f9184cb2..4636523d7948 100644
--- a/drivers/gpu/drm/i915/display/i9xx_plane.c
+++ b/drivers/gpu/drm/i915/display/i9xx_plane.c
@@ -577,7 +577,7 @@ vlv_primary_async_flip(struct intel_plane *plane,
        u32 dspaddr_offset = plane_state->view.color_plane[0].offset;
        enum i9xx_plane_id i9xx_plane = plane->i9xx_plane;
 
-       intel_de_write_fw(dev_priv, DSPADDR_VLV(i9xx_plane),
+       intel_de_write_fw(dev_priv, DSPADDR_VLV(dev_priv, i9xx_plane),
                          intel_plane_ggtt_offset(plane_state) + 
dspaddr_offset);
 }
 
diff --git a/drivers/gpu/drm/i915/display/i9xx_plane_regs.h 
b/drivers/gpu/drm/i915/display/i9xx_plane_regs.h
index d74a74d1f29a..926da106f1a2 100644
--- a/drivers/gpu/drm/i915/display/i9xx_plane_regs.h
+++ b/drivers/gpu/drm/i915/display/i9xx_plane_regs.h
@@ -9,7 +9,7 @@
 #include "intel_display_reg_defs.h"
 
 #define _DSPAADDR_VLV                          0x7017C /* vlv/chv */
-#define DSPADDR_VLV(plane)                     _MMIO_PIPE2(dev_priv, plane, 
_DSPAADDR_VLV)
+#define DSPADDR_VLV(dev_priv, plane)           _MMIO_PIPE2(dev_priv, plane, 
_DSPAADDR_VLV)
 
 #define _DSPACNTR                              0x70180
 #define DSPCNTR(plane)                         _MMIO_PIPE2(dev_priv, plane, 
_DSPACNTR)
-- 
2.39.2