xf86-video-ati: Branch 'master'

[Alex Deucher]

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

New commits:
commit f0e89c09074b2c7e641f73692bb39b0bf68eb49c
Author: Alex Deucher <alex at botch2.com>
Date:   Thu Mar 27 19:15:18 2008 -0400

    Revert "RADEON: attempt to fix lid issues"
    
    This reverts commit 9b4473c1d830b88866dd22e8174a07195bd6fcf4.
    This doesn't help.

diff --git a/src/radeon_driver.c b/src/radeon_driver.c
index 0183aa3..cc0b649 100644
--- a/src/radeon_driver.c
+++ b/src/radeon_driver.c
@@ -2980,8 +2980,7 @@ RADEONInitBIOSRegisters(ScrnInfoPtr pScrn)
 	/* let the bios control the backlight */
 	save->bios_2_scratch &= ~ATOM_S2_VRI_BRIGHT_ENABLE;
 	/* tell the bios not to handle mode switching */
-	save->bios_6_scratch |= (ATOM_S6_ACC_BLOCK_DISPLAY_SWITCH |
-				 ATOM_S6_ACC_MODE);
+	save->bios_6_scratch |= ATOM_S6_ACC_BLOCK_DISPLAY_SWITCH;
 
 	if (info->ChipFamily >= CHIP_FAMILY_R600) {
 	    OUTREG(R600_BIOS_2_SCRATCH, save->bios_2_scratch);
@@ -2994,8 +2993,7 @@ RADEONInitBIOSRegisters(ScrnInfoPtr pScrn)
 	/* let the bios control the backlight */
 	save->bios_0_scratch &= ~RADEON_DRIVER_BRIGHTNESS_EN;
 	/* tell the bios not to handle mode switching */
-	save->bios_6_scratch |= (RADEON_DISPLAY_SWITCHING_DIS |
-				 RADEON_ACC_MODE_CHANGE);
+	save->bios_6_scratch |= RADEON_DISPLAY_SWITCHING_DIS;
 	/* tell the bios a driver is loaded */
 	save->bios_7_scratch |= RADEON_DRV_LOADED;