From: Alex Deucher Date: Tue, 6 Aug 2013 17:34:00 +0000 (-0400) Subject: drm/radeon/dpm: require rlc for dpm X-Git-Tag: MMI-PSA29.97-13-9~13822^2~8^2~1 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=761bfb999868c413aabed8caa345694836ec6f11;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git 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 --- 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) case CHIP_VERDE: case CHIP_OLAND: case CHIP_HAINAN: - if (radeon_dpm == 1) + /* DPM requires the RLC */ + if (!rdev->rlc_fw) + rdev->pm.pm_method = PM_METHOD_PROFILE; + else if (radeon_dpm == 1) rdev->pm.pm_method = PM_METHOD_DPM; else rdev->pm.pm_method = PM_METHOD_PROFILE;