| From 53bf277b487eb5ae6695db01bede0fe406792119 Mon Sep 17 00:00:00 2001 |
| From: Alex Deucher <alexander.deucher@amd.com> |
| Date: Thu, 15 Feb 2018 08:40:30 -0500 |
| Subject: Revert "drm/radeon/pm: autoswitch power state when in balanced mode" |
| |
| From: Alex Deucher <alexander.deucher@amd.com> |
| |
| commit 53bf277b487eb5ae6695db01bede0fe406792119 upstream. |
| |
| This reverts commit 1c331f75aa6ccbf64ebcc5a019183e617c9d818a. |
| |
| Breaks resume on some systems. |
| |
| Bug: https://bugs.freedesktop.org/show_bug.cgi?id=100759 |
| Signed-off-by: Alex Deucher <alexander.deucher@amd.com> |
| Cc: stable@vger.kernel.org |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/gpu/drm/radeon/radeon_pm.c | 6 +----- |
| 1 file changed, 1 insertion(+), 5 deletions(-) |
| |
| --- a/drivers/gpu/drm/radeon/radeon_pm.c |
| +++ b/drivers/gpu/drm/radeon/radeon_pm.c |
| @@ -47,7 +47,6 @@ static bool radeon_pm_in_vbl(struct rade |
| static bool radeon_pm_debug_check_in_vbl(struct radeon_device *rdev, bool finish); |
| static void radeon_pm_update_profile(struct radeon_device *rdev); |
| static void radeon_pm_set_clocks(struct radeon_device *rdev); |
| -static void radeon_pm_compute_clocks_dpm(struct radeon_device *rdev); |
| |
| int radeon_pm_get_type_index(struct radeon_device *rdev, |
| enum radeon_pm_state_type ps_type, |
| @@ -80,8 +79,6 @@ void radeon_pm_acpi_event_handler(struct |
| radeon_dpm_enable_bapm(rdev, rdev->pm.dpm.ac_power); |
| } |
| mutex_unlock(&rdev->pm.mutex); |
| - /* allow new DPM state to be picked */ |
| - radeon_pm_compute_clocks_dpm(rdev); |
| } else if (rdev->pm.pm_method == PM_METHOD_PROFILE) { |
| if (rdev->pm.profile == PM_PROFILE_AUTO) { |
| mutex_lock(&rdev->pm.mutex); |
| @@ -885,8 +882,7 @@ static struct radeon_ps *radeon_dpm_pick |
| dpm_state = POWER_STATE_TYPE_INTERNAL_3DPERF; |
| /* balanced states don't exist at the moment */ |
| if (dpm_state == POWER_STATE_TYPE_BALANCED) |
| - dpm_state = rdev->pm.dpm.ac_power ? |
| - POWER_STATE_TYPE_PERFORMANCE : POWER_STATE_TYPE_BATTERY; |
| + dpm_state = POWER_STATE_TYPE_PERFORMANCE; |
| |
| restart_search: |
| /* Pick the best power state based on current conditions */ |
