[PATCH V3] drm/radeon/kms/r600+: use voltage from requested clock mode

[Alex Deucher]

2010/6/6 Rafał Miłecki <zajec5 at gmail.com>:
> Signed-off-by: Rafał Miłecki <zajec5 at gmail.com>

Good catch.

Signed-off-by: Alex Deucher <alexdeucher at gmail.com>

> ---
> This fixes FDO bug #28375, it's kind of regression, so quite important to have
> it for .35.
>
> V2: Fix on RV770+ as well. All other chipsets have only one clock mode per
> state.
>
> V3: I'm out of luck today. Grepped for voltage in r*.c and missed evergreen.
> ---
>  drivers/gpu/drm/radeon/evergreen.c |    7 ++++---
>  drivers/gpu/drm/radeon/r600.c      |    8 ++++----
>  drivers/gpu/drm/radeon/rv770.c     |    7 ++++---
>  3 files changed, 12 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/gpu/drm/radeon/evergreen.c b/drivers/gpu/drm/radeon/evergreen.c
> index 69c4b27..174f718 100644
> --- a/drivers/gpu/drm/radeon/evergreen.c
> +++ b/drivers/gpu/drm/radeon/evergreen.c
> @@ -41,9 +41,10 @@ void evergreen_fini(struct radeon_device *rdev);
>
>  void evergreen_pm_misc(struct radeon_device *rdev)
>  {
> -       int requested_index = rdev->pm.requested_power_state_index;
> -       struct radeon_power_state *ps = &rdev->pm.power_state[requested_index];
> -       struct radeon_voltage *voltage = &ps->clock_info[0].voltage;
> +       int req_ps_idx = rdev->pm.requested_power_state_index;
> +       int req_cm_idx = rdev->pm.requested_clock_mode_index;
> +       struct radeon_power_state *ps = &rdev->pm.power_state[req_ps_idx];
> +       struct radeon_voltage *voltage = &ps->clock_info[req_cm_idx].voltage;
>
>        if ((voltage->type == VOLTAGE_SW) && voltage->voltage)
>                radeon_atom_set_voltage(rdev, voltage->voltage);
> diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c
> index d84d7cf..94c27d0 100644
> --- a/drivers/gpu/drm/radeon/r600.c
> +++ b/drivers/gpu/drm/radeon/r600.c
> @@ -475,13 +475,13 @@ void r600_pm_init_profile(struct radeon_device *rdev)
>
>  void r600_pm_misc(struct radeon_device *rdev)
>  {
> -       int requested_index = rdev->pm.requested_power_state_index;
> -       struct radeon_power_state *ps = &rdev->pm.power_state[requested_index];
> -       struct radeon_voltage *voltage = &ps->clock_info[0].voltage;
> +       int req_ps_idx = rdev->pm.requested_power_state_index;
> +       int req_cm_idx = rdev->pm.requested_clock_mode_index;
> +       struct radeon_power_state *ps = &rdev->pm.power_state[req_ps_idx];
> +       struct radeon_voltage *voltage = &ps->clock_info[req_cm_idx].voltage;
>
>        if ((voltage->type == VOLTAGE_SW) && voltage->voltage)
>                radeon_atom_set_voltage(rdev, voltage->voltage);
> -
>  }
>
>  bool r600_gui_idle(struct radeon_device *rdev)
> diff --git a/drivers/gpu/drm/radeon/rv770.c b/drivers/gpu/drm/radeon/rv770.c
> index 5f76938..f002848 100644
> --- a/drivers/gpu/drm/radeon/rv770.c
> +++ b/drivers/gpu/drm/radeon/rv770.c
> @@ -44,9 +44,10 @@ void rv770_fini(struct radeon_device *rdev);
>
>  void rv770_pm_misc(struct radeon_device *rdev)
>  {
> -       int requested_index = rdev->pm.requested_power_state_index;
> -       struct radeon_power_state *ps = &rdev->pm.power_state[requested_index];
> -       struct radeon_voltage *voltage = &ps->clock_info[0].voltage;
> +       int req_ps_idx = rdev->pm.requested_power_state_index;
> +       int req_cm_idx = rdev->pm.requested_clock_mode_index;
> +       struct radeon_power_state *ps = &rdev->pm.power_state[req_ps_idx];
> +       struct radeon_voltage *voltage = &ps->clock_info[req_cm_idx].voltage;
>
>        if ((voltage->type == VOLTAGE_SW) && voltage->voltage)
>                radeon_atom_set_voltage(rdev, voltage->voltage);
> --
> 1.6.4.2
>
>