diff options
| author | Alex Deucher <alex@t41p.hsd1.va.comcast.net> | 2008-03-27 20:03:13 -0400 |
|---|---|---|
| committer | Alex Deucher <alex@t41p.hsd1.va.comcast.net> | 2008-03-27 20:03:13 -0400 |
| commit | a00d9260a85b94a522c442aee24bc5ea4dc31c5c (patch) | |
| tree | 5567da86b3948f053c19c1c21c5efa6f53e04285 | |
| parent | f0e89c09074b2c7e641f73692bb39b0bf68eb49c (diff) | |
RADEON: fix lid issues on AVIVO chips for real this time :)
| -rw-r--r-- | src/radeon_driver.c | 6 | ||||
| -rw-r--r-- | src/radeon_output.c | 8 |
2 files changed, 8 insertions, 6 deletions
diff --git a/src/radeon_driver.c b/src/radeon_driver.c index cc0b649c..0183aa32 100644 --- a/src/radeon_driver.c +++ b/src/radeon_driver.c @@ -2980,7 +2980,8 @@ 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; + save->bios_6_scratch |= (ATOM_S6_ACC_BLOCK_DISPLAY_SWITCH | + ATOM_S6_ACC_MODE); if (info->ChipFamily >= CHIP_FAMILY_R600) { OUTREG(R600_BIOS_2_SCRATCH, save->bios_2_scratch); @@ -2993,7 +2994,8 @@ 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; + save->bios_6_scratch |= (RADEON_DISPLAY_SWITCHING_DIS | + RADEON_ACC_MODE_CHANGE); /* tell the bios a driver is loaded */ save->bios_7_scratch |= RADEON_DRV_LOADED; diff --git a/src/radeon_output.c b/src/radeon_output.c index 19ce36d9..5ad0ac48 100644 --- a/src/radeon_output.c +++ b/src/radeon_output.c @@ -669,15 +669,15 @@ radeon_bios_output_lock(xf86OutputPtr output, Bool lock) if (info->IsAtomBios) { if (lock) { - save->bios_6_scratch |= (ATOM_S6_CRITICAL_STATE | ATOM_S6_ACC_MODE); + save->bios_6_scratch |= ATOM_S6_CRITICAL_STATE; } else { - save->bios_6_scratch &= ~(ATOM_S6_CRITICAL_STATE | ATOM_S6_ACC_MODE); + save->bios_6_scratch &= ~ATOM_S6_CRITICAL_STATE; } } else { if (lock) { - save->bios_6_scratch |= (RADEON_DRIVER_CRITICAL | RADEON_ACC_MODE_CHANGE); + save->bios_6_scratch |= RADEON_DRIVER_CRITICAL; } else { - save->bios_6_scratch &= ~(RADEON_DRIVER_CRITICAL | RADEON_ACC_MODE_CHANGE); + save->bios_6_scratch &= ~RADEON_DRIVER_CRITICAL; } } if (info->ChipFamily >= CHIP_FAMILY_R600) |