diff options
| author | Eric Anholt <eric@anholt.net> | 2008-06-05 14:57:18 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2008-06-05 14:57:18 -0700 |
| commit | 432d07fb175b385715eb3ccf97a303d2ad7bfe11 (patch) | |
| tree | 9d08a6f873820bf79956e39b484467d1f4bd39ad /src/i810_reg.h | |
| parent | 3a967b8359bd6c05a10111076cdb02df15cbf2e8 (diff) | |
| parent | bff180e6cac4452ef491c81855eb12bfa03d0bf3 (diff) | |
Merge branch 'master' into drm-gem
Diffstat (limited to 'src/i810_reg.h')
| -rw-r--r-- | src/i810_reg.h | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/src/i810_reg.h b/src/i810_reg.h index f60656ea..279677c7 100644 --- a/src/i810_reg.h +++ b/src/i810_reg.h @@ -491,6 +491,8 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * - new bits for i810 * - new register hwstam (mask) */ +#define PWRCTXA 0x2088 /* 965GM+ only */ +#define PWRCTX_EN (1<<0) #define HWSTAM 0x2098 /* p290 */ #define IER 0x20a0 /* p291 */ #define IIR 0x20a4 /* p292 */ @@ -528,7 +530,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ #define FWATER_BLC 0x20d8 #define FWATER_BLC2 0x20dc -#define FWATER_BLC_SELF 0x20e0 #define MM_BURST_LENGTH 0x00700000 #define MM_FIFO_WATERMARK 0x0001F000 #define LM_BURST_LENGTH 0x00000700 @@ -1152,6 +1153,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #define RENCLK_GATE_D2 0x6208 #define RAMCLK_GATE_D 0x6210 /* CRL only */ +#define DEUC 0x6214 /* CRL only */ /* * This is a PCI config space register to manipulate backlight brightness @@ -1251,6 +1253,10 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #define SDVO_CLOCK_OUTPUT_INVERT (1 << 18) #define SDVOC_GANG_MODE (1 << 16) #define SDVO_BORDER_ENABLE (1 << 7) +/** new with 965, default is to be set */ +#define SDVO_VSYNC_ACTIVE_HIGH (1 << 4) +#define SDVO_HSYNC_ACTIVE_HIGH (1 << 3) +/** 915/945 only, read-only bit */ #define SDVOB_PCIE_CONCURRENCY (1 << 3) #define SDVO_DETECTED (1 << 2) /* Bits to be preserved when writing */ @@ -2102,6 +2108,10 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #define DSPARB 0x70030 +#define DSPARB_CSTART_SHIFT 7 +#define DSPARB_BSTART_SHIFT 0 +#define DSPARB_BEND_SHIFT 9 /* on 855 */ +#define DSPARB_AEND_SHIFT 0 #define DSPFW1 0x70034 #define DSPFW2 0x70038 #define DSPFW3 0x7003c |