Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drm/i915/vga: Add more VGACNTRL bits

Define a pile of extra VGACNTRL bits. We don't really have
any real use for most of these but nicer to have them all
in one place rather than trawling the specs when one wants
to know what's in there.

I will have some real use for the CHV pipe select bits later.

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

+19 -2
+19 -2
drivers/gpu/drm/i915/i915_reg.h
··· 1778 1778 /* VBIOS regs */ 1779 1779 #define VGACNTRL _MMIO(0x71400) 1780 1780 #define VGA_DISP_DISABLE REG_BIT(31) 1781 - #define VGA_2X_MODE REG_BIT(30) 1782 - #define VGA_PIPE_SEL_MASK REG_BIT(29) 1781 + #define VGA_2X_MODE REG_BIT(30) /* pre-ilk */ 1782 + #define VGA_PIPE_SEL_MASK REG_BIT(29) /* pre-ivb */ 1783 1783 #define VGA_PIPE_SEL(pipe) REG_FIELD_PREP(VGA_PIPE_SEL_MASK, (pipe)) 1784 + #define VGA_PIPE_SEL_MASK_CHV REG_GENMASK(29, 28) /* chv */ 1785 + #define VGA_PIPE_SEL_CHV(pipe) REG_FIELD_PREP(VGA_PIPE_SEL_MASK_CHV, (pipe)) 1786 + #define VGA_BORDER_ENABLE REG_BIT(26) 1787 + #define VGA_PIPE_CSC_ENABLE REG_BIT(24) /* ilk+ */ 1788 + #define VGA_CENTERING_ENABLE_MASK REG_GENMASK(25, 24) /* pre-ilk */ 1789 + #define VGA_PALETTE_READ_SEL REG_BIT(23) /* pre-ivb */ 1790 + #define VGA_PALETTE_A_WRITE_DISABLE REG_BIT(22) /* pre-ivb */ 1791 + #define VGA_PALETTE_B_WRITE_DISABLE REG_BIT(21) /* pre-ivb */ 1792 + #define VGA_LEGACY_8BIT_PALETTE_ENABLE REG_BIT(20) 1793 + #define VGA_PALETTE_BYPASS REG_BIT(19) 1794 + #define VGA_NINE_DOT_DISABLE REG_BIT(18) 1795 + #define VGA_PALETTE_READ_SEL_HI_CHV REG_BIT(15) /* chv */ 1796 + #define VGA_PALETTE_C_WRITE_DISABLE_CHV REG_BIT(14) /* chv */ 1797 + #define VGA_ACTIVE_THROTTLING_MASK REG_GENMASK(15, 12) /* ilk+ */ 1798 + #define VGA_BLANK_THROTTLING_MASK REG_GENMASK(11, 8) /* ilk+ */ 1799 + #define VGA_BLINK_DUTY_CYCLE_MASK REG_GENMASK(7, 6) 1800 + #define VGA_VSYNC_BLINK_RATE_MASK REG_GENMASK(5, 0) 1784 1801 1785 1802 #define VLV_VGACNTRL _MMIO(VLV_DISPLAY_BASE + 0x71400) 1786 1803