Skip to content

Commit 84a357b

Browse files
committed
drm/i915/ddi: Sanitize DDI_BUF_CTL register definitions
Align the DDI_BUF_CTL register flag definitions with how this is done elsewhere. v2: Robustify macro calls with parens. (Jani) Reviewed-by: Jani Nikula <jani.nikula@intel.com> Signed-off-by: Imre Deak <imre.deak@intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20250214142001.552916-12-imre.deak@intel.com
1 parent a235928 commit 84a357b

1 file changed

Lines changed: 12 additions & 10 deletions

File tree

drivers/gpu/drm/i915/i915_reg.h

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3625,27 +3625,29 @@ enum skl_power_gate {
36253625
#define _DDI_BUF_CTL_B 0x64100
36263626
/* Known as DDI_CTL_DE in MTL+ */
36273627
#define DDI_BUF_CTL(port) _MMIO_PORT(port, _DDI_BUF_CTL_A, _DDI_BUF_CTL_B)
3628-
#define DDI_BUF_CTL_ENABLE (1 << 31)
3628+
#define DDI_BUF_CTL_ENABLE REG_BIT(31)
36293629
#define XE2LPD_DDI_BUF_D2D_LINK_ENABLE REG_BIT(29)
36303630
#define XE2LPD_DDI_BUF_D2D_LINK_STATE REG_BIT(28)
3631-
#define DDI_BUF_TRANS_SELECT(n) ((n) << 24)
3632-
#define DDI_BUF_EMP_MASK (0xf << 24)
3633-
#define DDI_BUF_PHY_LINK_RATE(r) ((r) << 20)
3631+
#define DDI_BUF_EMP_MASK REG_GENMASK(27, 24)
3632+
#define DDI_BUF_TRANS_SELECT(n) REG_FIELD_PREP(DDI_BUF_EMP_MASK, (n))
3633+
#define DDI_BUF_PHY_LINK_RATE_MASK REG_GENMASK(23, 20)
3634+
#define DDI_BUF_PHY_LINK_RATE(r) REG_FIELD_PREP(DDI_BUF_PHY_LINK_RATE_MASK, (r))
36343635
#define DDI_BUF_PORT_DATA_MASK REG_GENMASK(19, 18)
36353636
#define DDI_BUF_PORT_DATA_10BIT REG_FIELD_PREP(DDI_BUF_PORT_DATA_MASK, 0)
36363637
#define DDI_BUF_PORT_DATA_20BIT REG_FIELD_PREP(DDI_BUF_PORT_DATA_MASK, 1)
36373638
#define DDI_BUF_PORT_DATA_40BIT REG_FIELD_PREP(DDI_BUF_PORT_DATA_MASK, 2)
3638-
#define DDI_BUF_PORT_REVERSAL (1 << 16)
3639+
#define DDI_BUF_PORT_REVERSAL REG_BIT(16)
36393640
#define DDI_BUF_LANE_STAGGER_DELAY_MASK REG_GENMASK(15, 8)
36403641
#define DDI_BUF_LANE_STAGGER_DELAY(symbols) REG_FIELD_PREP(DDI_BUF_LANE_STAGGER_DELAY_MASK, \
36413642
(symbols))
3642-
#define DDI_BUF_IS_IDLE (1 << 7)
3643+
#define DDI_BUF_IS_IDLE REG_BIT(7)
36433644
#define DDI_BUF_CTL_TC_PHY_OWNERSHIP REG_BIT(6)
3644-
#define DDI_A_4_LANES (1 << 4)
3645-
#define DDI_PORT_WIDTH(width) (((width) == 3 ? 4 : ((width) - 1)) << 1)
3646-
#define DDI_PORT_WIDTH_MASK (7 << 1)
3645+
#define DDI_A_4_LANES REG_BIT(4)
3646+
#define DDI_PORT_WIDTH_MASK REG_GENMASK(3, 1)
3647+
#define DDI_PORT_WIDTH(width) REG_FIELD_PREP(DDI_PORT_WIDTH_MASK, \
3648+
((width) == 3 ? 4 : (width) - 1))
36473649
#define DDI_PORT_WIDTH_SHIFT 1
3648-
#define DDI_INIT_DISPLAY_DETECTED (1 << 0)
3650+
#define DDI_INIT_DISPLAY_DETECTED REG_BIT(0)
36493651

36503652
/* DDI Buffer Translations */
36513653
#define _DDI_BUF_TRANS_A 0x64E00

0 commit comments

Comments
 (0)