- Enable GPIO voltage for non pm modes as well so resetting
the default voltage works.
Signed-off-by: Alex Deucher <alexdeuc...@gmail.com>
---
drivers/gpu/drm/radeon/radeon_atombios.c | 9 ++++++---
drivers/gpu/drm/radeon/radeon_combios.c | 7 ++++++-
2 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/drivers/gpu/drm/radeon/radeon_atombios.c
b/drivers/gpu/drm/radeon/radeon_atombios.c
index ebfe8fd..da42306 100644
--- a/drivers/gpu/drm/radeon/radeon_atombios.c
+++ b/drivers/gpu/drm/radeon/radeon_atombios.c
@@ -1529,7 +1529,8 @@ void radeon_atombios_get_power_modes(struct radeon_device
*rdev)
rdev->pm.power_state[state_index].pcie_lanes =
power_info->info.asPowerPlayInfo[i].ucNumPciELanes;
misc =
le32_to_cpu(power_info->info.asPowerPlayInfo[i].ulMiscInfo);
- if (misc &
ATOM_PM_MISCINFO_VOLTAGE_DROP_SUPPORT) {
+ if ((misc &
ATOM_PM_MISCINFO_VOLTAGE_DROP_SUPPORT) ||
+ (misc &
ATOM_PM_MISCINFO_VOLTAGE_DROP_ACTIVE_HIGH)) {
rdev->pm.power_state[state_index].clock_info[0].voltage.type =
VOLTAGE_GPIO;
rdev->pm.power_state[state_index].clock_info[0].voltage.gpio =
@@ -1596,7 +1597,8 @@ void radeon_atombios_get_power_modes(struct radeon_device
*rdev)
power_info->info_2.asPowerPlayInfo[i].ucNumPciELanes;
misc =
le32_to_cpu(power_info->info_2.asPowerPlayInfo[i].ulMiscInfo);
misc2 =
le32_to_cpu(power_info->info_2.asPowerPlayInfo[i].ulMiscInfo2);
- if (misc &
ATOM_PM_MISCINFO_VOLTAGE_DROP_SUPPORT) {
+ if ((misc &
ATOM_PM_MISCINFO_VOLTAGE_DROP_SUPPORT) ||
+ (misc &
ATOM_PM_MISCINFO_VOLTAGE_DROP_ACTIVE_HIGH)) {
rdev->pm.power_state[state_index].clock_info[0].voltage.type =
VOLTAGE_GPIO;
rdev->pm.power_state[state_index].clock_info[0].voltage.gpio =
@@ -1670,7 +1672,8 @@ void radeon_atombios_get_power_modes(struct radeon_device
*rdev)
power_info->info_3.asPowerPlayInfo[i].ucNumPciELanes;
misc =
le32_to_cpu(power_info->info_3.asPowerPlayInfo[i].ulMiscInfo);
misc2 =
le32_to_cpu(power_info->info_3.asPowerPlayInfo[i].ulMiscInfo2);
- if (misc &
ATOM_PM_MISCINFO_VOLTAGE_DROP_SUPPORT) {
+ if ((misc &
ATOM_PM_MISCINFO_VOLTAGE_DROP_SUPPORT) ||
+ (misc &
ATOM_PM_MISCINFO_VOLTAGE_DROP_ACTIVE_HIGH)) {
rdev->pm.power_state[state_index].clock_info[0].voltage.type =
VOLTAGE_GPIO;
rdev->pm.power_state[state_index].clock_info[0].voltage.gpio =
diff --git a/drivers/gpu/drm/radeon/radeon_combios.c
b/drivers/gpu/drm/radeon/radeon_combios.c
index 7b5e10d..102c744 100644
--- a/drivers/gpu/drm/radeon/radeon_combios.c
+++ b/drivers/gpu/drm/radeon/radeon_combios.c
@@ -2454,7 +2454,12 @@ default_mode:
rdev->pm.power_state[state_index].clock_info[0].mclk =
rdev->clock.default_mclk;
rdev->pm.power_state[state_index].clock_info[0].sclk =
rdev->clock.default_sclk;
rdev->pm.power_state[state_index].default_clock_mode =
&rdev->pm.power_state[state_index].clock_info[0];
- rdev->pm.power_state[state_index].clock_info[0].voltage.type =
VOLTAGE_NONE;
+ if ((state_index > 0) &&
+ (rdev->pm.power_state[0].clock_info[0].voltage.type = VOLTAGE_GPIO))
+ rdev->pm.power_state[state_index].clock_info[0].voltage =
+ rdev->pm.power_state[0].clock_info[0].voltage;
+ else
+ rdev->pm.power_state[state_index].clock_info[0].voltage.type =
VOLTAGE_NONE;
rdev->pm.power_state[state_index].pcie_lanes = 16;
rdev->pm.power_state[state_index].flags = 0;
rdev->pm.default_power_state_index = state_index;
--
1.5.6.3
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel
