diff options
| author | Keith Packard <keithp@neko.keithp.com> | 2006-06-19 13:28:09 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@neko.keithp.com> | 2006-06-19 13:28:09 -0700 |
| commit | 52243d407cad93283956660de4771097ac0b4b2d (patch) | |
| tree | 1fa041d665792f58eb13d9c07c0876c01a9aa532 /src/i810_reg.h | |
| parent | 2fb375b665f4802819b89f2277fd6154006c11ee (diff) | |
| parent | 34f6a8204f1edec015283fc6b5f196e47897e3de (diff) | |
Merge branch 'modesetting-origin' into modesetting
Diffstat (limited to 'src/i810_reg.h')
| -rw-r--r-- | src/i810_reg.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/i810_reg.h b/src/i810_reg.h index f7ba930f..8fd60221 100644 --- a/src/i810_reg.h +++ b/src/i810_reg.h @@ -755,6 +755,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 @@ -772,7 +773,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 |