summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJesse Barnes <jbarnes@hobbes.virtuousgeek.org>2007-11-12 09:19:22 -0800
committerJesse Barnes <jbarnes@hobbes.virtuousgeek.org>2007-11-12 09:19:22 -0800
commit10988c5e6ec0f3c40d56bbf209b7976627cca706 (patch)
tree5945d24106dd9b95af029c0d24fca6c21aada6cd
parentab2055ebb20aa6de121fa377e488ce91913035ae (diff)
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.
-rw-r--r--src/i830_driver.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/i830_driver.c b/src/i830_driver.c
index eacaefc1..fdbf9ece 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);