From: Alex Deucher Date: Mon, 1 Jul 2013 20:07:18 +0000 (-0400) Subject: drm/radeon/dpm: re-enable state transitions for Cayman X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=7ad8d0687bb5030c3328bc7229a3183ce179ab25;p=openwrt%2Fstaging%2Fblogic.git drm/radeon/dpm: re-enable state transitions for Cayman Was disabled due to stability issues on certain boards caused by the a bug in the parsing of the atom mc reg tables. That's fixed now so re-enable. Signed-off-by: Alex Deucher --- diff --git a/drivers/gpu/drm/radeon/ni_dpm.c b/drivers/gpu/drm/radeon/ni_dpm.c index 777d17e61312..4712851808a3 100644 --- a/drivers/gpu/drm/radeon/ni_dpm.c +++ b/drivers/gpu/drm/radeon/ni_dpm.c @@ -1036,7 +1036,6 @@ static int ni_restrict_performance_levels_before_switch(struct radeon_device *rd 0 : -EINVAL; } -#if 0 static int ni_unrestrict_performance_levels_after_switch(struct radeon_device *rdev) { if (ni_send_msg_to_smc_with_parameter(rdev, PPSMC_MSG_SetForcedLevels, 0) != PPSMC_Result_OK) @@ -1045,7 +1044,6 @@ static int ni_unrestrict_performance_levels_after_switch(struct radeon_device *r return (ni_send_msg_to_smc_with_parameter(rdev, PPSMC_MSG_SetEnabledLevels, 0) == PPSMC_Result_OK) ? 0 : -EINVAL; } -#endif static void ni_stop_smc(struct radeon_device *rdev) { @@ -3832,14 +3830,11 @@ int ni_dpm_set_power_state(struct radeon_device *rdev) return ret; } -#if 0 - /* XXX */ ret = ni_unrestrict_performance_levels_after_switch(rdev); if (ret) { DRM_ERROR("ni_unrestrict_performance_levels_after_switch failed\n"); return ret; } -#endif return 0; }