diff --git a/src/i830_driver.c b/src/i830_driver.c
index e2d1e6f..1fc6e16 100644
--- a/src/i830_driver.c
+++ b/src/i830_driver.c
@@ -2082,6 +2082,7 @@ RestoreHWState(ScrnInfoPtr pScrn)
    }
    OUTREG(FPA0, pI830->saveFPA0);
    OUTREG(FPA1, pI830->saveFPA1);
+   i830_dpll_settle();
    OUTREG(DPLL_A, pI830->saveDPLL_A);
    i830_dpll_settle();
    if (IS_I965G(pI830))
@@ -2141,6 +2142,7 @@ RestoreHWState(ScrnInfoPtr pScrn)
       }
       OUTREG(FPB0, pI830->saveFPB0);
       OUTREG(FPB1, pI830->saveFPB1);
+      i830_dpll_settle();
       OUTREG(DPLL_B, pI830->saveDPLL_B);
       i830_dpll_settle();
       if (IS_I965G(pI830))