summaryrefslogtreecommitdiff
path: root/src/i810_reg.h
diff options
context:
space:
mode:
authorKeith Packard <keithp@mactel.(none)>2006-06-04 00:15:06 -0700
committerKeith Packard <keithp@mactel.(none)>2006-06-04 00:15:06 -0700
commit34f6a8204f1edec015283fc6b5f196e47897e3de (patch)
tree95d6caca2aea6ac7dbbc5a6d28865eb1bb689fe6 /src/i810_reg.h
parentc1c46f882f9a11c383c8d1d1ce393be8fda55ed0 (diff)
Get sDVO output working on mac mini.
Add lots of register debugging to track delta from BIOS settings. Fix various mode settings to mirror BIOS sDVO values. Disable analog/lvds output on pipe with sDVO. Borrow Dave Airlie's I830xf86ValidateDDCModes code. Fix various sDVO I2C messages to mirror Dave's code.
Diffstat (limited to 'src/i810_reg.h')
-rw-r--r--src/i810_reg.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/i810_reg.h b/src/i810_reg.h
index 53c65bbf..92e3342f 100644
--- a/src/i810_reg.h
+++ b/src/i810_reg.h
@@ -748,6 +748,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
# define TV_HOTPLUG_INT_STATUS (1 << 10)
# define SDVOC_HOTPLUG_INT_STATUS (1 << 7)
# define SDVOB_HOTPLUG_INT_STATUS (1 << 6)
+#define SDVOB_PRESERVE_MASK ((1 << 17) | (1 << 16) | (1 << 14))
#define SDVOB 0x61140
#define SDVOC 0x61160
@@ -765,7 +766,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#define SDVOB_PCIE_CONCURRENCY (1 << 3)
#define SDVO_DETECTED (1 << 2)
/* Bits to be preserved when writing */
-#define SDVO_PRESERVE_MASK (1 << 17)
+#define SDVOC_PRESERVE_MASK (1 << 17)
#define I830_HTOTAL_MASK 0xfff0000
#define I830_HACTIVE_MASK 0x7ff