summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Deucher <alexdeucher@gmail.com>2009-04-21 01:21:51 -0400
committerAlex Deucher <alexdeucher@gmail.com>2009-04-21 01:21:51 -0400
commit06a1b4169b506f69dd807380d9ce7210b3a3bc23 (patch)
tree60eec2021f306cd503656271c9e201ab5e07b375
parent228b9ac87668241b09980fca17e9d866891285e6 (diff)
R4xx: avoid a PM related hang
-rw-r--r--src/radeon_atombios.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/radeon_atombios.c b/src/radeon_atombios.c
index dc101cf7..189e3f08 100644
--- a/src/radeon_atombios.c
+++ b/src/radeon_atombios.c
@@ -555,6 +555,12 @@ atombios_static_pwrmgt_setup(ScrnInfoPtr pScrn, Bool enable)
AtomBiosArgRec data;
unsigned char *space;
+ /* disabling static power management causes hangs on some r4xx chips */
+ if (((info->ChipFamily == CHIP_FAMILY_R420) ||
+ (info->ChipFamily == CHIP_FAMILY_RV410)) &&
+ !enable)
+ return ATOM_NOT_IMPLEMENTED;
+
pwrmgt_data.ucEnable = enable;
data.exec.index = GetIndexIntoMasterTable(COMMAND, EnableASIC_StaticPwrMgt);