diff options
| author | Eric Anholt <eric@anholt.net> | 2008-03-10 11:47:15 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2008-06-19 15:01:35 -0700 |
| commit | 9a05662918223477eb1cf6f80ffac08712721c70 (patch) | |
| tree | 0bef41cfd1d2557048c5521adebebc783aebcb7f | |
| parent | beba1dd3561e38573ed9f507328caf7f8fb9f84a (diff) | |
The phase shift its are now reserved, and add HDMI clock limits.
| -rw-r--r-- | src/i830_display.c | 2 | ||||
| -rw-r--r-- | src/i830_hdmi.c | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/src/i830_display.c b/src/i830_display.c index 7697d4f0..7857ee36 100644 --- a/src/i830_display.c +++ b/src/i830_display.c @@ -1175,7 +1175,7 @@ i830_crtc_mode_set(xf86CrtcPtr crtc, DisplayModePtr mode, dpll |= DPLLB_LVDS_P2_CLOCK_DIV_14; break; } - if (IS_I965G(pI830)) + if (IS_I965G(pI830) && !IS_IGD_GM(pI830)) dpll |= (6 << PLL_LOAD_PULSE_PHASE_SHIFT); } else { if (is_lvds) { diff --git a/src/i830_hdmi.c b/src/i830_hdmi.c index 103443f6..a5d2265b 100644 --- a/src/i830_hdmi.c +++ b/src/i830_hdmi.c @@ -43,6 +43,12 @@ struct i830_hdmi_priv { static int i830_hdmi_mode_valid(xf86OutputPtr output, DisplayModePtr mode) { + if (mode->Clock > 165000) + return MODE_CLOCK_HIGH; + + if (mode->Clock < 20000) + return MODE_CLOCK_LOW; + return MODE_OK; } |