aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Deucher <alexander.deucher@amd.com>2013-08-06 13:34:00 -0400
committerAlex Deucher <alexander.deucher@amd.com>2013-08-07 17:37:19 -0400
commit761bfb999868c413aabed8caa345694836ec6f11 (patch)
tree5586962e6d4651852dc624dda5d1602162554ea6
parentf61d5b46771a352fad1ac7f99008ef52a7ffcb72 (diff)
drm/radeon/dpm: require rlc for dpm
The rlc is required for dpm to work properly, so if the rlc ucode is missing, don't enable dpm. Enabling dpm without the rlc enabled can result in hangs. Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
-rw-r--r--drivers/gpu/drm/radeon/radeon_pm.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_pm.c b/drivers/gpu/drm/radeon/radeon_pm.c
index f374c467aaca..6a7a80b8a00a 100644
--- a/drivers/gpu/drm/radeon/radeon_pm.c
+++ b/drivers/gpu/drm/radeon/radeon_pm.c
@@ -1176,7 +1176,10 @@ int radeon_pm_init(struct radeon_device *rdev)
1176 case CHIP_VERDE: 1176 case CHIP_VERDE:
1177 case CHIP_OLAND: 1177 case CHIP_OLAND:
1178 case CHIP_HAINAN: 1178 case CHIP_HAINAN:
1179 if (radeon_dpm == 1) 1179 /* DPM requires the RLC */
1180 if (!rdev->rlc_fw)
1181 rdev->pm.pm_method = PM_METHOD_PROFILE;
1182 else if (radeon_dpm == 1)
1180 rdev->pm.pm_method = PM_METHOD_DPM; 1183 rdev->pm.pm_method = PM_METHOD_DPM;
1181 else 1184 else
1182 rdev->pm.pm_method = PM_METHOD_PROFILE; 1185 rdev->pm.pm_method = PM_METHOD_PROFILE;