FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2025-01-02 15:21:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

drm/radeon/dpm: remove broken dyn state remnants

Browse Source 
Now that the proper fix has been implemented I can
remove the last remnants of the initial implementation.

Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Alex Deucher 2013-01-16 14:40:26 -05:00
parent fee3d744bf
commit 89c9bc5651
2 changed files with 5 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/gpu/drm/radeon/radeon.h
View File

@ -1302,7 +1302,6 @@ struct radeon_dpm {
struct radeon_ps *boot_ps; struct radeon_ps *boot_ps;
/* default uvd power state */ /* default uvd power state */
struct radeon_ps *uvd_ps; struct radeon_ps *uvd_ps;
struct radeon_ps hw_ps;
enum radeon_pm_state_type state; enum radeon_pm_state_type state;
enum radeon_pm_state_type user_state; enum radeon_pm_state_type user_state;
u32 platform_caps; u32 platform_caps;

24
drivers/gpu/drm/radeon/radeon_pm.c
View File

@ -684,17 +684,6 @@ restart_search:
return NULL; return NULL;
} }
static void radeon_dpm_update_requested_ps(struct radeon_device *rdev,
struct radeon_ps *ps)
{
/* copy the ps to the hw ps and point the requested ps
* at the hw state in case the driver wants to modify
* the state dynamically.
*/
rdev->pm.dpm.hw_ps = *ps;
rdev->pm.dpm.requested_ps = &rdev->pm.dpm.hw_ps;
}
static void radeon_dpm_change_power_state_locked(struct radeon_device *rdev) static void radeon_dpm_change_power_state_locked(struct radeon_device *rdev)
{ {
int i; int i;
@ -716,7 +705,7 @@ static void radeon_dpm_change_power_state_locked(struct radeon_device *rdev)
ps = radeon_dpm_pick_power_state(rdev, dpm_state); ps = radeon_dpm_pick_power_state(rdev, dpm_state);
if (ps) if (ps)
radeon_dpm_update_requested_ps(rdev, ps); rdev->pm.dpm.requested_ps = ps;
else else
return; return;
@ -767,11 +756,9 @@ static void radeon_dpm_change_power_state_locked(struct radeon_device *rdev)
down_write(&rdev->pm.mclk_lock); down_write(&rdev->pm.mclk_lock);
mutex_lock(&rdev->ring_lock); mutex_lock(&rdev->ring_lock);
if (rdev->asic->dpm.pre_set_power_state) { ret = radeon_dpm_pre_set_power_state(rdev);
ret = radeon_dpm_pre_set_power_state(rdev); if (ret)
if (ret) goto done;
goto done;
}
/* update display watermarks based on new power state */ /* update display watermarks based on new power state */
radeon_bandwidth_update(rdev); radeon_bandwidth_update(rdev);
@ -794,8 +781,7 @@ static void radeon_dpm_change_power_state_locked(struct radeon_device *rdev)
/* update current power state */ /* update current power state */
rdev->pm.dpm.current_ps = rdev->pm.dpm.requested_ps; rdev->pm.dpm.current_ps = rdev->pm.dpm.requested_ps;
if (rdev->asic->dpm.post_set_power_state) radeon_dpm_post_set_power_state(rdev);
radeon_dpm_post_set_power_state(rdev);
done: done:
mutex_unlock(&rdev->ring_lock); mutex_unlock(&rdev->ring_lock);