[PATCH 14/16] drm/i915: pass dev_priv explicitly to PRIMSIZE

[Jani Nikula]

Avoid the implicit dev_priv local variable use, and pass dev_priv
explicitly to the PRIMSIZE 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 | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/i9xx_plane.c 
b/drivers/gpu/drm/i915/display/i9xx_plane.c
index 1cefcdd4f26a..82cb393a0a22 100644
--- a/drivers/gpu/drm/i915/display/i9xx_plane.c
+++ b/drivers/gpu/drm/i915/display/i9xx_plane.c
@@ -476,7 +476,7 @@ static void i9xx_plane_update_arm(struct intel_plane *plane,
 
                intel_de_write_fw(dev_priv, PRIMPOS(dev_priv, i9xx_plane),
                                  PRIM_POS_Y(crtc_y) | PRIM_POS_X(crtc_x));
-               intel_de_write_fw(dev_priv, PRIMSIZE(i9xx_plane),
+               intel_de_write_fw(dev_priv, PRIMSIZE(dev_priv, i9xx_plane),
                                  PRIM_HEIGHT(crtc_h - 1) | PRIM_WIDTH(crtc_w - 
1));
                intel_de_write_fw(dev_priv, PRIMCNSTALPHA(i9xx_plane), 0);
        }
diff --git a/drivers/gpu/drm/i915/display/i9xx_plane_regs.h 
b/drivers/gpu/drm/i915/display/i9xx_plane_regs.h
index 7f291b34f10a..8d45c879e74a 100644
--- a/drivers/gpu/drm/i915/display/i9xx_plane_regs.h
+++ b/drivers/gpu/drm/i915/display/i9xx_plane_regs.h
@@ -94,8 +94,8 @@
 #define   PRIM_POS_X_MASK      REG_GENMASK(15, 0)
 #define   PRIM_POS_X(x)                REG_FIELD_PREP(PRIM_POS_X_MASK, (x))
 
-#define _PRIMSIZE_A            0x60a0c
-#define PRIMSIZE(plane)                _MMIO_TRANS2(dev_priv, plane, 
_PRIMSIZE_A)
+#define _PRIMSIZE_A                    0x60a0c
+#define PRIMSIZE(dev_priv, plane)      _MMIO_TRANS2(dev_priv, plane, 
_PRIMSIZE_A)
 #define   PRIM_HEIGHT_MASK     REG_GENMASK(31, 16)
 #define   PRIM_HEIGHT(h)       REG_FIELD_PREP(PRIM_HEIGHT_MASK, (h))
 #define   PRIM_WIDTH_MASK      REG_GENMASK(15, 0)
-- 
2.39.2