drm/i915: Convert MBUS_ABOX_CTL() to _PICK_EVEN_2RANGES()

MBUS_ABOX_CTL() can use _PICK_EVEN_2RANGES instead of _PICK, which
reduces the size and is safer.

Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
Reviewed-by: Anusha Srivatsa <anusha.srivatsa@intel.com>
Acked-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230120193457.3295977-8-lucas.demarchi@intel.com

diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
index d63d735ee3afcea07eee23c76c7e03f287e29eee..539e4b1d061a9eb8618c7ef9c0619563ef5e0034 100644 (file)
--- a/drivers/gpu/drm/i915/i915_reg.h
+++ b/drivers/gpu/drm/i915/i915_reg.h
@@ -1040,9 +1040,11 @@
 #define _MBUS_ABOX0_CTL                        0x45038
 #define _MBUS_ABOX1_CTL                        0x45048
 #define _MBUS_ABOX2_CTL                        0x4504C
-#define MBUS_ABOX_CTL(x)               _MMIO(_PICK(x, _MBUS_ABOX0_CTL, \
-                                                   _MBUS_ABOX1_CTL, \
-                                                   _MBUS_ABOX2_CTL))
+#define MBUS_ABOX_CTL(x)                                                       \
+       _MMIO(_PICK_EVEN_2RANGES(x, 2,                                          \
+                                _MBUS_ABOX0_CTL, _MBUS_ABOX1_CTL,              \
+                                _MBUS_ABOX2_CTL, _MBUS_ABOX2_CTL))
+
 #define MBUS_ABOX_BW_CREDIT_MASK       (3 << 20)
 #define MBUS_ABOX_BW_CREDIT(x)         ((x) << 20)
 #define MBUS_ABOX_B_CREDIT_MASK                (0xF << 16)