diff options
| author | Stuart Bennett <sb476@cam.ac.uk> | 2008-01-30 14:35:25 +0000 |
|---|---|---|
| committer | Stuart Bennett <sb476@cam.ac.uk> | 2008-01-30 15:48:10 +0000 |
| commit | 6e090591bd2dab051362d8528a3bc76f30418d94 (patch) | |
| tree | 8cdf331fae9098e00a0937cb1d496a89bf684f2f /src/nvreg.h | |
| parent | e51799382e40c033b2d6d09dd65dd7f7c1e5e4d6 (diff) | |
PCRTC define additions
Diffstat (limited to 'src/nvreg.h')
| -rw-r--r-- | src/nvreg.h | 59 |
1 files changed, 30 insertions, 29 deletions
diff --git a/src/nvreg.h b/src/nvreg.h index 204cbce..79d2204 100644 --- a/src/nvreg.h +++ b/src/nvreg.h @@ -135,7 +135,7 @@ #define NV_VGA_CRTCX_LCD 0x33 #define NV_VGA_CRTCX_INTERLACE 0x39 #define NV_VGA_CRTCX_3B 0x3b -#define NV_VGA_CRTCX_3C 0x3c +#define NV_VGA_CRTCX_SCRATCH4 0x3c #define NV_VGA_CRTCX_EXTRA 0x41 #define NV_VGA_CRTCX_43 0x43 #define NV_VGA_CRTCX_OWNER 0x44 @@ -181,6 +181,35 @@ #define NV_PEXTDEV_BOOT_0 0x00101000 # define NV_PEXTDEV_BOOT_0_STRAP_FP_IFACE_12BIT (1 << 15) +#define NV_PEXTDEV_BOOT_3 0x0010100c + +#define NV_CRTC_INTR_0 0x00600100 +# define NV_CRTC_INTR_VBLANK (1<<0) +#define NV_CRTC_INTR_EN_0 0x00600140 +#define NV_CRTC_START 0x00600800 +#define NV_CRTC_CONFIG 0x00600804 +#define NV_CRTC_CURSOR_ADDRESS 0x0060080C +#define NV_CRTC_CURSOR_CONFIG 0x00600810 +# define NV_CRTC_CURSOR_CONFIG_ENABLE (1 << 0) +# define NV_CRTC_CURSOR_CONFIG_DOUBLE_SCAN (1 << 4) +# define NV_CRTC_CURSOR_CONFIG_32BPP (1 << 12) +# define NV_CRTC_CURSOR_CONFIG_64PIXELS (1 << 16) +# define NV_CRTC_CURSOR_CONFIG_32LINES (1 << 25) +# define NV_CRTC_CURSOR_CONFIG_64LINES (1 << 26) +# define NV_CRTC_CURSOR_CONFIG_ALPHA_BLEND (1 << 28) + +#define NV_CRTC_GPIO 0x00600818 +#define NV_PCRTC_GPIO_EXT 0x0060081c +#define NV_CRTC_0830 0x00600830 +#define NV_CRTC_0834 0x00600834 +#define NV_CRTC_0850 0x00600850 +#define NV_CRTC_FSEL 0x00600860 +# define NV_CRTC_FSEL_I2C (1<<4) +# define NV_CRTC_FSEL_TVOUT1 (1<<8) +# define NV_CRTC_FSEL_TVOUT2 (2<<8) +# define NV_CRTC_FSEL_OVERLAY (1<<12) +# define NV_CRTC_FSEL_FPP2 (1<<16) +# define NV_CRTC_FSEL_FPP1 (2<<16) #define NV_RAMDAC_CURSOR_POS 0x00680300 #define NV_RAMDAC_CURSOR_CTRL 0x00680320 @@ -339,34 +368,6 @@ #define NV_RAMDAC_A24 0x00680A24 #define NV_RAMDAC_A34 0x00680A34 -#define NV_CRTC_INTR_0 0x00600100 -# define NV_CRTC_INTR_VBLANK (1<<0) -#define NV_CRTC_INTR_EN_0 0x00600140 -#define NV_CRTC_START 0x00600800 -#define NV_CRTC_CONFIG 0x00600804 -#define NV_CRTC_CURSOR_ADDRESS 0x0060080C -#define NV_CRTC_CURSOR_CONFIG 0x00600810 -# define NV_CRTC_CURSOR_CONFIG_ENABLE (1 << 0) -# define NV_CRTC_CURSOR_CONFIG_DOUBLE_SCAN (1 << 4) -# define NV_CRTC_CURSOR_CONFIG_32BPP (1 << 12) -# define NV_CRTC_CURSOR_CONFIG_64PIXELS (1 << 16) -# define NV_CRTC_CURSOR_CONFIG_32LINES (1 << 25) -# define NV_CRTC_CURSOR_CONFIG_64LINES (1 << 26) -# define NV_CRTC_CURSOR_CONFIG_ALPHA_BLEND (1 << 28) - -#define NV_CRTC_GPIO 0x00600818 -#define NV_CRTC_081C 0x0060081c -#define NV_CRTC_0830 0x00600830 -#define NV_CRTC_0834 0x00600834 -#define NV_CRTC_0850 0x00600850 -#define NV_CRTC_FSEL 0x00600860 -# define NV_CRTC_FSEL_I2C (1<<4) -# define NV_CRTC_FSEL_TVOUT1 (1<<8) -# define NV_CRTC_FSEL_TVOUT2 (2<<8) -# define NV_CRTC_FSEL_OVERLAY (1<<12) -# define NV_CRTC_FSEL_FPP2 (1<<16) -# define NV_CRTC_FSEL_FPP1 (2<<16) - #define NV_PGRAPH_DEBUG_0 0x00400080 #define NV_PGRAPH_DEBUG_1 0x00400084 #define NV_PGRAPH_DEBUG_2_NV04 0x00400088 |