[PATCH 6/8] drm/i915: pass dev_priv explicitly to CUR_FBC_CTL

[Jani Nikula]

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

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

diff --git a/drivers/gpu/drm/i915/display/intel_cursor.c 
b/drivers/gpu/drm/i915/display/intel_cursor.c
index 8553f6164760..c780ce146131 100644
--- a/drivers/gpu/drm/i915/display/intel_cursor.c
+++ b/drivers/gpu/drm/i915/display/intel_cursor.c
@@ -646,7 +646,8 @@ static void i9xx_cursor_update_arm(struct intel_plane 
*plane,
            plane->cursor.size != fbc_ctl ||
            plane->cursor.cntl != cntl) {
                if (HAS_CUR_FBC(dev_priv))
-                       intel_de_write_fw(dev_priv, CUR_FBC_CTL(pipe),
+                       intel_de_write_fw(dev_priv,
+                                         CUR_FBC_CTL(dev_priv, pipe),
                                          fbc_ctl);
                intel_de_write_fw(dev_priv, CURCNTR(dev_priv, pipe), cntl);
                intel_de_write_fw(dev_priv, CURPOS(dev_priv, pipe), pos);
diff --git a/drivers/gpu/drm/i915/display/intel_cursor_regs.h 
b/drivers/gpu/drm/i915/display/intel_cursor_regs.h
index 7c3a76f5151d..40b01205e247 100644
--- a/drivers/gpu/drm/i915/display/intel_cursor_regs.h
+++ b/drivers/gpu/drm/i915/display/intel_cursor_regs.h
@@ -71,7 +71,7 @@
 #define CURPOS(dev_priv, pipe) _MMIO_CURSOR2(dev_priv, pipe, _CURAPOS)
 #define CURPOS_ERLY_TPT(dev_priv, pipe) _MMIO_CURSOR2(dev_priv, pipe, 
_CURAPOS_ERLY_TPT)
 #define CURSIZE(dev_priv, pipe) _MMIO_CURSOR2(dev_priv, pipe, _CURASIZE)
-#define CUR_FBC_CTL(pipe) _MMIO_CURSOR2(dev_priv, pipe, _CUR_FBC_CTL_A)
+#define CUR_FBC_CTL(dev_priv, pipe) _MMIO_CURSOR2(dev_priv, pipe, 
_CUR_FBC_CTL_A)
 #define CUR_CHICKEN(pipe) _MMIO_CURSOR2(dev_priv, pipe, _CUR_CHICKEN_A)
 #define CURSURFLIVE(pipe) _MMIO_CURSOR2(dev_priv, pipe, _CURASURFLIVE)
 
diff --git a/drivers/gpu/drm/i915/intel_gvt_mmio_table.c 
b/drivers/gpu/drm/i915/intel_gvt_mmio_table.c
index 5ea1fbc2e981..b485976976db 100644
--- a/drivers/gpu/drm/i915/intel_gvt_mmio_table.c
+++ b/drivers/gpu/drm/i915/intel_gvt_mmio_table.c
@@ -154,9 +154,9 @@ static int iterate_generic_mmio(struct 
intel_gvt_mmio_table_iter *iter)
        MMIO_D(CURBASE(dev_priv, PIPE_A));
        MMIO_D(CURBASE(dev_priv, PIPE_B));
        MMIO_D(CURBASE(dev_priv, PIPE_C));
-       MMIO_D(CUR_FBC_CTL(PIPE_A));
-       MMIO_D(CUR_FBC_CTL(PIPE_B));
-       MMIO_D(CUR_FBC_CTL(PIPE_C));
+       MMIO_D(CUR_FBC_CTL(dev_priv, PIPE_A));
+       MMIO_D(CUR_FBC_CTL(dev_priv, PIPE_B));
+       MMIO_D(CUR_FBC_CTL(dev_priv, PIPE_C));
        MMIO_D(_MMIO(0x700ac));
        MMIO_D(_MMIO(0x710ac));
        MMIO_D(_MMIO(0x720ac));
-- 
2.39.2