diff options
| author | Eric Anholt <anholt@FreeBSD.org> | 2006-04-24 16:55:44 -0700 |
|---|---|---|
| committer | Eric Anholt <anholt@FreeBSD.org> | 2006-04-24 16:55:44 -0700 |
| commit | a555e28e5afc81969ef7b28482e654cc26b3a446 (patch) | |
| tree | 2f8dcb6806b61051236deacde16491a074b633f3 | |
| parent | cc70e6b789a1901bbe4e3501b6b654542d3cdc20 (diff) | |
Correct some SDVO-related register definitions.
| -rw-r--r-- | src/i810_reg.h | 5 | ||||
| -rw-r--r-- | src/i830_sdvo_regs.h | 8 |
2 files changed, 7 insertions, 6 deletions
diff --git a/src/i810_reg.h b/src/i810_reg.h index dee39cef..53c65bbf 100644 --- a/src/i810_reg.h +++ b/src/i810_reg.h @@ -757,11 +757,12 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #define SDVO_INTERRUPT_ENABLE (1 << 26) /* Programmed value is multiplier - 1, up to 5x. alv, gdg only */ #define SDVO_PORT_MULTIPLY_MASK (7 << 23) -#define SDVO_PHASE_SELECT_MASK (15 << 23) -#define SDVO_PHASE_SELECT_DEFAULT (6 << 23) +#define SDVO_PHASE_SELECT_MASK (15 << 19) +#define SDVO_PHASE_SELECT_DEFAULT (6 << 19) #define SDVO_CLOCK_OUTPUT_INVERT (1 << 18) #define SDVOC_GANG_MODE (1 << 16) #define SDVO_BORDER_ENABLE (1 << 7) +#define SDVOB_PCIE_CONCURRENCY (1 << 3) #define SDVO_DETECTED (1 << 2) /* Bits to be preserved when writing */ #define SDVO_PRESERVE_MASK (1 << 17) diff --git a/src/i830_sdvo_regs.h b/src/i830_sdvo_regs.h index 9165c394..37cfcf2e 100644 --- a/src/i830_sdvo_regs.h +++ b/src/i830_sdvo_regs.h @@ -122,7 +122,7 @@ # define SDVO_DTD_HSYNC_OFF SDVO_I2C_ARG_0 # define SDVO_DTD_HSYNC_WIDTH SDVO_I2C_ARG_1 # define SDVO_DTD_VSYNC_OFF_WIDTH SDVO_I2C_ARG_2 -# define SDVO_DTD_SYSNC_OFF_WIDTH_HIGH SDVO_I2C_ARG_3 +# define SDVO_DTD_SYNC_OFF_WIDTH_HIGH SDVO_I2C_ARG_3 # define SDVO_DTD_DTD_FLAGS SDVO_I2C_ARG_4 # define SDVO_DTD_DTD_FLAG_INTERLACED (1 << 7) # define SDVO_DTD_DTD_FLAG_STEREO_MASK (3 << 5) @@ -155,9 +155,9 @@ #define SDVO_CMD_GET_CLOCK_RATE_MULT 0x20 #define SDVO_CMD_SET_CLOCK_RATE_MULT 0x21 -# define SDVO_CLOCK_RATE_MULT_1X 0 -# define SDVO_CLOCK_RATE_MULT_2X 1 -# define SDVO_CLOCK_RATE_MULT_4X 3 +# define SDVO_CLOCK_RATE_MULT_1X (1 << 0) +# define SDVO_CLOCK_RATE_MULT_2X (1 << 1) +# define SDVO_CLOCK_RATE_MULT_4X (1 << 3) #define SDVO_CMD_GET_SUPPORTED_TV_FORMATS 0x27 |