xf86-video-intel: src/i830_driver.c

[Jesse Barnes]

 src/i830_driver.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 10988c5e6ec0f3c40d56bbf209b7976627cca706
Author: Jesse Barnes <jbarnes at hobbes.virtuousgeek.org>
Date:   Mon Nov 12 09:19:22 2007 -0800

    Fix typo in PLL enable check
    
    Check against DPLL_A instead of DPLL_B before writing PIPEACONF.
    
    Thanks to Colin Guthrie for his sharp eyes.

diff --git a/src/i830_driver.c b/src/i830_driver.c
index eacaefc..fdbf9ec 100644
--- a/src/i830_driver.c
+++ b/src/i830_driver.c
@@ -2056,8 +2056,8 @@ RestoreHWState(ScrnInfoPtr pScrn)
     * Make sure the DPLL is active and not in VGA mode or the
     * write of PIPEnCONF may cause a crash
     */
-   if ((pI830->saveDPLL_B & DPLL_VCO_ENABLE) &&
-       (pI830->saveDPLL_B & DPLL_VGA_MODE_DIS))
+   if ((pI830->saveDPLL_A & DPLL_VCO_ENABLE) &&
+       (pI830->saveDPLL_A & DPLL_VGA_MODE_DIS))
 	   OUTREG(PIPEACONF, pI830->savePIPEACONF);
    i830WaitForVblank(pScrn);
    OUTREG(DSPACNTR, pI830->saveDSPACNTR);