From: Ville Syrjälä Date: Thu, 17 Apr 2025 11:44:49 +0000 (+0300) Subject: drm/i915/vga: Clean up VGACNTRL bits X-Git-Tag: v6.16-rc1~144^2~12^2~43 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e7bf2f608172ac8aefe0fa5f4ebca7da3538f2a6;p=thirdparty%2Fkernel%2Fstable.git drm/i915/vga: Clean up VGACNTRL bits Use REG_BIT() & co. for the VGACNTRL register bits. Signed-off-by: Ville Syrjälä Link: https://patchwork.freedesktop.org/patch/msgid/20250417114454.12836-2-ville.syrjala@linux.intel.com Reviewed-by: Jani Nikula --- diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h index 88c46a7c948f8..5430fb0be0332 100644 --- a/drivers/gpu/drm/i915/i915_reg.h +++ b/drivers/gpu/drm/i915/i915_reg.h @@ -1777,9 +1777,10 @@ /* VBIOS regs */ #define VGACNTRL _MMIO(0x71400) -# define VGA_DISP_DISABLE (1 << 31) -# define VGA_2X_MODE (1 << 30) -# define VGA_PIPE_B_SELECT (1 << 29) +#define VGA_DISP_DISABLE REG_BIT(31) +#define VGA_2X_MODE REG_BIT(30) +#define VGA_PIPE_SEL_MASK REG_BIT(29) +#define VGA_PIPE_SEL(pipe) REG_FIELD_PREP(VGA_PIPE_SEL_MASK, (pipe)) #define VLV_VGACNTRL _MMIO(VLV_DISPLAY_BASE + 0x71400)