diff options
| author | Hong Liu <hong.liu@intel.com> | 2008-06-04 16:58:05 +0800 |
|---|---|---|
| committer | Zhenyu Wang <zhenyu.z.wang@intel.com> | 2008-06-12 13:47:33 +0800 |
| commit | 85308ab8aaf58b6620a41621128eba0b7e1ffb44 (patch) | |
| tree | 2bc74c6024cc54521874f33eb9b57014c775a45e /src | |
| parent | 14dc93cb4dabdd83ee62a2a497c210aeb52f6c30 (diff) | |
Set SDVO sync polarity to default on 965
Fix fd.o bug 15766
(cherry picked from commit beb72ae5aa053303f5cc419e9c9d7c6db964f160)
Diffstat (limited to 'src')
| -rw-r--r-- | src/i810_reg.h | 4 | ||||
| -rw-r--r-- | src/i830_sdvo.c | 4 |
2 files changed, 7 insertions, 1 deletions
diff --git a/src/i810_reg.h b/src/i810_reg.h index 5ca8ca92..79a5b1e6 100644 --- a/src/i810_reg.h +++ b/src/i810_reg.h @@ -1222,6 +1222,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 */ diff --git a/src/i830_sdvo.c b/src/i830_sdvo.c index f60e38cf..0dc6dca3 100644 --- a/src/i830_sdvo.c +++ b/src/i830_sdvo.c @@ -730,7 +730,9 @@ i830_sdvo_mode_set(xf86OutputPtr output, DisplayModePtr mode, /* Set the SDVO control regs. */ if (IS_I965G(pI830)) { - sdvox = SDVO_BORDER_ENABLE; + sdvox = SDVO_BORDER_ENABLE | + SDVO_VSYNC_ACTIVE_HIGH | + SDVO_HSYNC_ACTIVE_HIGH; } else { sdvox = INREG(dev_priv->output_device); switch (dev_priv->output_device) { |