summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Deucher <alex@t41p.hsd1.va.comcast.net>2007-06-12 23:20:18 -0400
committerAlex Deucher <alex@t41p.hsd1.va.comcast.net>2007-06-12 23:20:18 -0400
commitc292fc64499ff4cc135c07deda99cf4169f8fef4 (patch)
tree7ef40bebd6b5c0d82061aac7d0bfb914c82d404a
parentc6a3286d6f6ddda89115d98d45665dadd78bf41d (diff)
RADEON: make sure RADEON_LVDS_ON is cleared when turning LVDS off
- fixes bug 3483
-rw-r--r--src/radeon_display.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/radeon_display.c b/src/radeon_display.c
index acb4d301..b2eaf090 100644
--- a/src/radeon_display.c
+++ b/src/radeon_display.c
@@ -1675,11 +1675,11 @@ void RADEONEnableDisplay(ScrnInfoPtr pScrn, RADEONConnector* pPort, BOOL bEnable
OUTPLLP(pScrn, RADEON_PIXCLKS_CNTL, 0, ~RADEON_PIXCLK_LVDS_ALWAYS_ONb);
}
tmp = INREG(RADEON_LVDS_GEN_CNTL);
- tmp |= (RADEON_LVDS_ON | RADEON_LVDS_DISPLAY_DIS);
- tmp &= ~(RADEON_LVDS_BLON);
+ tmp |= RADEON_LVDS_DISPLAY_DIS;
+ tmp &= ~(RADEON_LVDS_ON | RADEON_LVDS_BLON);
OUTREG(RADEON_LVDS_GEN_CNTL, tmp);
- save->lvds_gen_cntl |= (RADEON_LVDS_ON | RADEON_LVDS_DISPLAY_DIS);
- save->lvds_gen_cntl &= ~(RADEON_LVDS_BLON);
+ save->lvds_gen_cntl |= RADEON_LVDS_DISPLAY_DIS;
+ save->lvds_gen_cntl &= ~(RADEON_LVDS_ON | RADEON_LVDS_BLON);
if (info->IsMobility || info->IsIGP) {
OUTPLL(pScrn, RADEON_PIXCLKS_CNTL, tmpPixclksCntl);
}