xf86-video-ati: Branch 'master'

[Alex Deucher]

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

New commits:
diff-tree f19a6f7ee5bf4ec632e7813359f167599c08e823 (from 44748a826b52924a6e050215d8d62755e0ac7fb2)
Author: Alex Deucher <alex at t41p.hsd1.va.comcast.net>
Date:   Tue Jun 12 23:44:41 2007 -0400

    RADEON: additional LVDS off fix (missed in previous commit)

diff --git a/src/radeon_display.c b/src/radeon_display.c
index b2eaf09..0889582 100644
--- a/src/radeon_display.c
+++ b/src/radeon_display.c
@@ -1569,8 +1569,8 @@ void RADEONDisableDisplays(ScrnInfoPtr p
 	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);
     if (info->IsMobility || info->IsIGP) {
 	OUTPLL(pScrn, RADEON_PIXCLKS_CNTL, tmpPixclksCntl);