Fix 965GM SDVO by not setting fields in SDVO[BC] which have new meanings.
This commit is contained in:
parent
a0c83af343
commit
8bb677889d
|
|
@ -647,16 +647,20 @@ i830_sdvo_mode_set(xf86OutputPtr output, DisplayModePtr mode,
|
|||
}
|
||||
|
||||
/* Set the SDVO control regs. */
|
||||
sdvox = INREG(dev_priv->output_device);
|
||||
switch (dev_priv->output_device) {
|
||||
case SDVOB:
|
||||
sdvox &= SDVOB_PRESERVE_MASK;
|
||||
break;
|
||||
case SDVOC:
|
||||
sdvox &= SDVOC_PRESERVE_MASK;
|
||||
break;
|
||||
if (IS_I965GM(pI830)) {
|
||||
sdvox = SDVO_BORDER_ENABLE;
|
||||
} else {
|
||||
sdvox = INREG(dev_priv->output_device);
|
||||
switch (dev_priv->output_device) {
|
||||
case SDVOB:
|
||||
sdvox &= SDVOB_PRESERVE_MASK;
|
||||
break;
|
||||
case SDVOC:
|
||||
sdvox &= SDVOC_PRESERVE_MASK;
|
||||
break;
|
||||
}
|
||||
sdvox |= (9 << 19) | SDVO_BORDER_ENABLE;
|
||||
}
|
||||
sdvox |= (9 << 19) | SDVO_BORDER_ENABLE;
|
||||
if (intel_crtc->pipe == 1)
|
||||
sdvox |= SDVO_PIPE_B_SELECT;
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue