drm/i915: pass dev_priv explicitly to DSPADDR_VLV

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

Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/1d9be6b1eedd9240468a89cd3a10e8513caa33b1.1716469091.git.jani.nikula@intel.com
Signed-off-by: Jani Nikula <jani.nikula@intel.com>

diff --git a/drivers/gpu/drm/i915/display/i9xx_plane.c b/drivers/gpu/drm/i915/display/i9xx_plane.c
index 1f05f9184cb24b2fc08ee9813a2bf1d9f1b00548..4636523d7948af1822c2f71d25e743121a69f138 100644 (file)
--- 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 d74a74d1f29a69ced7c947833cdd2bfeaca6cea6..926da106f1a2939e1e8cd3948d412070b02fda7d 100644 (file)
--- 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)