xf86-video-ati: Branch 'master' - 2 commits

[Alex Deucher]

 src/radeon_bios.c    |    3 +++
 src/radeon_display.c |    8 ++++----
 2 files changed, 7 insertions(+), 4 deletions(-)

New commits:
diff-tree 44748a826b52924a6e050215d8d62755e0ac7fb2 (from c292fc64499ff4cc135c07deda99cf4169f8fef4)
Author: Tormod Volden <bugzi06.fdo.tormod at xoxy.net>
Date:   Tue Jun 12 23:23:49 2007 -0400

    RADEON: limit PanelPwrDly to 2000 ms on ATOM bios as per legacy bios
    
    - fixes bug 11238

diff --git a/src/radeon_bios.c b/src/radeon_bios.c
index e62fb25..fefa6ff 100644
--- a/src/radeon_bios.c
+++ b/src/radeon_bios.c
@@ -432,6 +432,9 @@ Bool RADEONGetLVDSInfoFromBIOS (ScrnInfo
 	    info->VSyncWidth = RADEON_BIOS16(tmp+20);
 	    info->PanelPwrDly = RADEON_BIOS16(tmp+40);
 
+	    if (info->PanelPwrDly > 2000 || info->PanelPwrDly < 0)
+		info->PanelPwrDly = 2000;
+
 	    info->Flags = 0;
 	    xf86DrvMsg(pScrn->scrnIndex, X_WARNING, 
 		       "LVDS Info:\n"
diff-tree c292fc64499ff4cc135c07deda99cf4169f8fef4 (from c6a3286d6f6ddda89115d98d45665dadd78bf41d)
Author: Alex Deucher <alex at t41p.hsd1.va.comcast.net>
Date:   Tue Jun 12 23:20:18 2007 -0400

    RADEON: make sure RADEON_LVDS_ON is cleared when turning LVDS off
    
    - fixes bug 3483

diff --git a/src/radeon_display.c b/src/radeon_display.c
index acb4d30..b2eaf09 100644
--- a/src/radeon_display.c
+++ b/src/radeon_display.c
@@ -1675,11 +1675,11 @@ void RADEONEnableDisplay(ScrnInfoPtr pSc
 		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);
 	    }