diff options
| author | Stuart Bennett <stuart@freedesktop.org> | 2009-03-15 04:08:56 +0000 |
|---|---|---|
| committer | Stuart Bennett <stuart@freedesktop.org> | 2009-03-23 01:32:12 +0000 |
| commit | a9df3049a7e38b3bf4478459e5f0736e10927247 (patch) | |
| tree | 44e074dda5680b5d8dc0a51d61d9f7aaf692f361 /src/nvreg.h | |
| parent | 2c0710d334e3e1dcb04cc4fc0b46ec4c8cdb9ba6 (diff) | |
pre-nv50: use nvidia's names for PCRTC regs where known
Mostly adding 'P' to the previous NV_CTRC regs -- either when known
correct, or when totally unknown (eg NV_PCRTC_850); made-up names
untouched. Lack of code changes checked with cpp.
Unused defines removed too.
Diffstat (limited to 'src/nvreg.h')
| -rw-r--r-- | src/nvreg.h | 49 |
1 files changed, 23 insertions, 26 deletions
diff --git a/src/nvreg.h b/src/nvreg.h index 50914cc..02c62c0 100644 --- a/src/nvreg.h +++ b/src/nvreg.h @@ -160,35 +160,32 @@ # define NV_PEXTDEV_BOOT_0_STRAP_FP_IFACE_12BIT (8 << 12) #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_PCRTC_CONFIG_START_ADDRESS_NON_VGA 1 - #define NV_PCRTC_CONFIG_START_ADDRESS_HSYNC 2 -#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_PCRTC_INTR_0 0x00600100 +# define NV_PCRTC_INTR_0_VBLANK (1 << 0) +#define NV_PCRTC_INTR_EN_0 0x00600140 +#define NV_PCRTC_START 0x00600800 +#define NV_PCRTC_CONFIG 0x00600804 +# define NV_PCRTC_CONFIG_START_ADDRESS_NON_VGA (1 << 0) +# define NV_PCRTC_CONFIG_START_ADDRESS_HSYNC (2 << 0) +#define NV_PCRTC_CURSOR_CONFIG 0x00600810 +# define NV_PCRTC_CURSOR_CONFIG_ENABLE_ENABLE (1 << 0) +# define NV_PCRTC_CURSOR_CONFIG_DOUBLE_SCAN_ENABLE (1 << 4) # define NV_PCRTC_CURSOR_CONFIG_ADDRESS_SPACE_PNVM (1 << 8) -# define NV_CRTC_CURSOR_CONFIG_32BPP (1 << 12) -# define NV_CRTC_CURSOR_CONFIG_64PIXELS (1 << 16) -# define NV_CRTC_CURSOR_CONFIG_32LINES (2 << 24) -# define NV_CRTC_CURSOR_CONFIG_64LINES (4 << 24) -# define NV_CRTC_CURSOR_CONFIG_ALPHA_BLEND (1 << 28) +# define NV_PCRTC_CURSOR_CONFIG_CUR_BPP_32 (1 << 12) +# define NV_PCRTC_CURSOR_CONFIG_CUR_PIXELS_64 (1 << 16) +# define NV_PCRTC_CURSOR_CONFIG_CUR_LINES_32 (2 << 24) +# define NV_PCRTC_CURSOR_CONFIG_CUR_LINES_64 (4 << 24) +# define NV_PCRTC_CURSOR_CONFIG_CUR_BLEND_ALPHA (1 << 28) /* note: PCRTC_GPIO is not available on nv10, and in fact aliases 0x600810 */ -#define NV_CRTC_GPIO 0x00600818 -#define NV_CRTC_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_PCRTC_GPIO 0x00600818 +#define NV_PCRTC_GPIO_EXT 0x0060081c +#define NV_PCRTC_830 0x00600830 +#define NV_PCRTC_834 0x00600834 +#define NV_PCRTC_850 0x00600850 +#define NV_PCRTC_ENGINE_CTRL 0x00600860 +# define NV_CRTC_FSEL_I2C (1 << 4) +# define NV_CRTC_FSEL_OVERLAY (1 << 12) #define NV_PRMCIO_ARX 0x006013c0 #define NV_PRMCIO_AR__WRITE 0x006013c0 |