drm/i915: s/_CURSOR2/_MMIO_CURSOR2//
authorVille Syrjälä <ville.syrjala@linux.intel.com>
Thu, 23 Jun 2022 13:08:56 +0000 (16:08 +0300)
committerVille Syrjälä <ville.syrjala@linux.intel.com>
Mon, 27 Jun 2022 16:05:47 +0000 (19:05 +0300)
The other similar macros have the _MMIO prefix, so give
it also to _CURSOR2.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220623130900.26078-6-ville.syrjala@linux.intel.com
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
drivers/gpu/drm/i915/i915_reg.h

index 76c47f6..b8c254d 100644 (file)
                                         INTEL_INFO(dev_priv)->display.trans_offsets[TRANSCODER_A] + \
                                         DISPLAY_MMIO_BASE(dev_priv) + (reg))
 #define _MMIO_TRANS2(tran, reg)                _MMIO(_TRANS2(tran, reg))
-#define _CURSOR2(pipe, reg)            _MMIO(INTEL_INFO(dev_priv)->display.cursor_offsets[(pipe)] - \
+#define _MMIO_CURSOR2(pipe, reg)       _MMIO(INTEL_INFO(dev_priv)->display.cursor_offsets[(pipe)] - \
                                              INTEL_INFO(dev_priv)->display.cursor_offsets[PIPE_A] + \
                                              DISPLAY_MMIO_BASE(dev_priv) + (reg))
 
 #define _CURBBASE_IVB          0x71084
 #define _CURBPOS_IVB           0x71088
 
-#define CURCNTR(pipe) _CURSOR2(pipe, _CURACNTR)
-#define CURBASE(pipe) _CURSOR2(pipe, _CURABASE)
-#define CURPOS(pipe) _CURSOR2(pipe, _CURAPOS)
-#define CURSIZE(pipe) _CURSOR2(pipe, _CURASIZE)
-#define CUR_FBC_CTL(pipe) _CURSOR2(pipe, _CUR_FBC_CTL_A)
-#define CURSURFLIVE(pipe) _CURSOR2(pipe, _CURASURFLIVE)
+#define CURCNTR(pipe) _MMIO_CURSOR2(pipe, _CURACNTR)
+#define CURBASE(pipe) _MMIO_CURSOR2(pipe, _CURABASE)
+#define CURPOS(pipe) _MMIO_CURSOR2(pipe, _CURAPOS)
+#define CURSIZE(pipe) _MMIO_CURSOR2(pipe, _CURASIZE)
+#define CUR_FBC_CTL(pipe) _MMIO_CURSOR2(pipe, _CUR_FBC_CTL_A)
+#define CURSURFLIVE(pipe) _MMIO_CURSOR2(pipe, _CURASURFLIVE)
 
 #define CURSOR_A_OFFSET 0x70080
 #define CURSOR_B_OFFSET 0x700c0